Browse Source

Added empty tenants page.

pull/206/head
Halil İbrahim Kalkan 8 years ago
parent
commit
2dba9992c7
  1. 13
      Volo.Abp.sln
  2. 2
      src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj
  3. 7
      src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
  4. 1
      src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
  5. 38
      src/Volo.Abp.MultiTenancy.Web/AbpMultiTenancyWebModule.cs
  6. 12
      src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/IdentityResource.cs
  7. 6
      src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json
  8. 6
      src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/tr.json
  9. 24
      src/Volo.Abp.MultiTenancy.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
  10. 7
      src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml
  11. 12
      src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml.cs
  12. 27
      src/Volo.Abp.MultiTenancy.Web/Properties/launchSettings.json
  13. 29
      src/Volo.Abp.MultiTenancy.Web/Volo.Abp.MultiTenancy.Web.csproj

13
Volo.Abp.sln

@ -234,13 +234,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Domai
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Domain.Shared", "src\Volo.Abp.MultiTenancy.Domain.Shared\Volo.Abp.MultiTenancy.Domain.Shared.csproj", "{4605A64C-B4E0-4A04-9BF2-501027375258}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiTenancy.Application.Contracts", "src\Volo.Abp.MultiTenancy.Application.Contracts\Volo.Abp.MultiTenancy.Application.Contracts.csproj", "{6A99C679-EA3B-4324-8D6B-89DB8C7D3DA0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Application.Contracts", "src\Volo.Abp.MultiTenancy.Application.Contracts\Volo.Abp.MultiTenancy.Application.Contracts.csproj", "{6A99C679-EA3B-4324-8D6B-89DB8C7D3DA0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiTenancy.Application", "src\Volo.Abp.MultiTenancy.Application\Volo.Abp.MultiTenancy.Application.csproj", "{FCEC7C9D-067F-452B-98C9-1878F7EA02EB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Application", "src\Volo.Abp.MultiTenancy.Application\Volo.Abp.MultiTenancy.Application.csproj", "{FCEC7C9D-067F-452B-98C9-1878F7EA02EB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.MultiTenancy", "Abp.MultiTenancy", "{3CE22CAC-4B27-4EEC-A35E-C01219ED6E99}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiTenancy.Application.Tests", "test\Volo.Abp.MultiTenancy.Application.Tests\Volo.Abp.MultiTenancy.Application.Tests.csproj", "{B65973F1-9EE0-4914-B6F2-D88F753E1D21}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Application.Tests", "test\Volo.Abp.MultiTenancy.Application.Tests\Volo.Abp.MultiTenancy.Application.Tests.csproj", "{B65973F1-9EE0-4914-B6F2-D88F753E1D21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiTenancy.Web", "src\Volo.Abp.MultiTenancy.Web\Volo.Abp.MultiTenancy.Web.csproj", "{0808036D-065B-4525-BF30-CBCEA062F8E9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -628,6 +630,10 @@ Global
{B65973F1-9EE0-4914-B6F2-D88F753E1D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B65973F1-9EE0-4914-B6F2-D88F753E1D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B65973F1-9EE0-4914-B6F2-D88F753E1D21}.Release|Any CPU.Build.0 = Release|Any CPU
{0808036D-065B-4525-BF30-CBCEA062F8E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0808036D-065B-4525-BF30-CBCEA062F8E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0808036D-065B-4525-BF30-CBCEA062F8E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0808036D-065B-4525-BF30-CBCEA062F8E9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -745,6 +751,7 @@ Global
{FCEC7C9D-067F-452B-98C9-1878F7EA02EB} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6}
{3CE22CAC-4B27-4EEC-A35E-C01219ED6E99} = {447C8A77-E5F0-4538-8687-7383196D04EA}
{B65973F1-9EE0-4914-B6F2-D88F753E1D21} = {3CE22CAC-4B27-4EEC-A35E-C01219ED6E99}
{0808036D-065B-4525-BF30-CBCEA062F8E9} = {CA154803-3589-47B3-B7CB-B18F94FE1EB6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

2
src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj

@ -27,6 +27,8 @@
<ProjectReference Include="..\..\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj" />
<ProjectReference Include="..\..\Volo.Abp.IdentityServer.Domain\Volo.Abp.IdentityServer.Domain.csproj" />
<ProjectReference Include="..\..\Volo.Abp.IdentityServer.EntityFrameworkCore\Volo.Abp.IdentityServer.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\Volo.Abp.MultiTenancy.Application\Volo.Abp.MultiTenancy.Application.csproj" />
<ProjectReference Include="..\..\Volo.Abp.MultiTenancy.Web\Volo.Abp.MultiTenancy.Web.csproj" />
<ProjectReference Include="..\AbpDesk.Application.Contracts\AbpDesk.Application.Contracts.csproj" />
<ProjectReference Include="..\..\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\AbpDesk.EntityFrameworkCore\AbpDesk.EntityFrameworkCore.csproj" />

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

@ -27,6 +27,8 @@ using Volo.Abp.Modularity;
using Volo.Abp.Ui.Navigation;
using Volo.Abp.VirtualFileSystem;
using Volo.Abp.IdentityServer.Jwt;
using Volo.Abp.MultiTenancy;
using Volo.Abp.MultiTenancy.Web;
namespace AbpDesk.Web.Mvc
{
@ -42,7 +44,9 @@ namespace AbpDesk.Web.Mvc
typeof(AbpAutofacModule),
typeof(AbpIdentityServerDomainModule),
typeof(AbpIdentityServerEntityFrameworkCoreModule),
typeof(AbpAspNetCoreMultiTenancyModule)
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(AbpMultiTenancyWebModule),
typeof(AbpMultiTenancyApplicationModule)
)]
public class AbpDeskWebMvcModule : AbpModule //TODO: Rename to AbpDeskWebModule, change default namespace to AbpDesk.Web
{
@ -120,6 +124,7 @@ namespace AbpDesk.Web.Mvc
options.FileSets.ReplaceEmbeddedByPyhsical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, "..\\..\\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpAccountWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, "..\\..\\Volo.Abp.Account.Web"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpIdentityWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, "..\\..\\Volo.Abp.Identity.Web"));
options.FileSets.ReplaceEmbeddedByPyhsical<AbpMultiTenancyWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, "..\\..\\Volo.Abp.MultiTenancy.Web"));
});
}
}

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

@ -41,7 +41,6 @@ namespace Volo.Abp.Identity.Web
services.Configure<AbpLocalizationOptions>(options =>
{
//options.Resources.AddVirtual<IdentityResource>("en");
options.Resources.AddVirtualJson<IdentityResource>("en", "/Localization/Resources/AbpIdentity");
});

38
src/Volo.Abp.MultiTenancy.Web/AbpMultiTenancyWebModule.cs

@ -0,0 +1,38 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
using Volo.Abp.AutoMapper;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy.Web.Localization.Resources.AbpMultiTenancy;
using Volo.Abp.MultiTenancy.Web.Navigation;
using Volo.Abp.Ui.Navigation;
using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp.MultiTenancy.Web
{
[DependsOn(typeof(AbpMultiTenancyApplicationContractsModule))]
[DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))]
[DependsOn(typeof(AbpAutoMapperModule))]
public class AbpMultiTenancyWebModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)
{
services.AddAssemblyOf<AbpMultiTenancyWebModule>();
services.Configure<NavigationOptions>(options =>
{
options.MenuContributors.Add(new AbpMultiTenancyWebMainMenuContributor());
});
services.Configure<VirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<AbpMultiTenancyWebModule>("Volo.Abp.MultiTenancy.Web");
});
services.Configure<AbpLocalizationOptions>(options =>
{
options.Resources.AddVirtualJson<AbpMultiTenancyResource>("en", "/Localization/Resources/AbpMultiTenancy");
});
}
}
}

12
src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/IdentityResource.cs

@ -0,0 +1,12 @@
using Volo.Abp.Localization;
using Volo.Abp.Localization.Resources.AbpValidation;
namespace Volo.Abp.MultiTenancy.Web.Localization.Resources.AbpMultiTenancy
{
[ShortLocalizationResourceName("AbpMultiTenancy")]
[InheritResource(typeof(AbpValidationResource))]
public class AbpMultiTenancyResource
{
}
}

6
src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json

@ -0,0 +1,6 @@
{
"culture": "en",
"texts": {
}
}

6
src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/tr.json

@ -0,0 +1,6 @@
{
"culture": "tr",
"texts": {
}
}

24
src/Volo.Abp.MultiTenancy.Web/Navigation/AbpIdentityWebMainMenuContributor.cs

@ -0,0 +1,24 @@
using System.Threading.Tasks;
using Volo.Abp.Ui.Navigation;
namespace Volo.Abp.MultiTenancy.Web.Navigation
{
public class AbpMultiTenancyWebMainMenuContributor : IMenuContributor
{
public Task ConfigureMenuAsync(MenuConfigurationContext context)
{
if (context.Menu.Name != StandardMenus.Main)
{
return Task.CompletedTask;
}
context.Menu
.AddItem(
new ApplicationMenuItem("MultiTenancy", "MultiTenancy")
.AddItem(new ApplicationMenuItem("Tenants", "Tenants", url: "/MultiTenancy/Tenants"))
);
return Task.CompletedTask;
}
}
}

7
src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml

@ -0,0 +1,7 @@
@page
@using Volo.Abp.MultiTenancy.Web.Pages.MultiTenancy.Tenants
@model IndexModel
@{
}
Tenants page...

12
src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml.cs

@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace Volo.Abp.MultiTenancy.Web.Pages.MultiTenancy.Tenants
{
public class IndexModel : PageModel
{
public void OnGet()
{
}
}
}

27
src/Volo.Abp.MultiTenancy.Web/Properties/launchSettings.json

@ -0,0 +1,27 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:62977/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Volo.Abp.MultiTenancy.Web": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:62978/"
}
}
}

29
src/Volo.Abp.MultiTenancy.Web/Volo.Abp.MultiTenancy.Web.csproj

@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Volo.Abp.MultiTenancy.Web</AssemblyName>
<PackageId>Volo.Abp.MultiTenancy.Web</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*.*" />
<EmbeddedResource Include="Pages\**\*.cshtml" />
<EmbeddedResource Include="Localization\Resources\**\*.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
<ProjectReference Include="..\Volo.Abp.MultiTenancy.Application.Contracts\Volo.Abp.MultiTenancy.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
</Project>
Loading…
Cancel
Save