Merge branch 'master' of https://github.com/volosoft/abp

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.csproj

@@ -9,6 +9,16 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Volo\Blogging\Localization\ApplicationContracts\en.json" />
+    <None Remove="Volo\Blogging\Localization\ApplicationContracts\tr.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Blogging\Localization\ApplicationContracts\en.json" />
+    <EmbeddedResource Include="Volo\Blogging\Localization\ApplicationContracts\tr.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Volo.Blogging.Domain.Shared\Volo.Blogging.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs

@@ -1,6 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
+using Volo.Blogging.Localization;
 
 namespace Volo.Blogging
 {
@@ -9,6 +12,13 @@ namespace Volo.Blogging
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<BloggingResource>()
+                    .AddVirtualJson("/Localization/Resources/Blogging/ApplicationContracts");
+            });
+
             context.Services.Configure<PermissionOptions>(options =>
             {
                 options.DefinitionProviders.Add<BloggingPermissionDefinitionProvider>();

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissionDefinitionProvider.cs

@@ -10,17 +10,17 @@ namespace Volo.Blogging
         {
             var bloggingGroup = context.AddGroup(BloggingPermissions.GroupName, L("Permission:Blogging"));
 
-            var blogs = bloggingGroup.AddPermission(BloggingPermissions.Blogs.Default, L("Permission:BlogManagement"));
+            var blogs = bloggingGroup.AddPermission(BloggingPermissions.Blogs.Default, L("Permission:Blogs"));
             blogs.AddChild(BloggingPermissions.Blogs.Update, L("Permission:Edit"));
             blogs.AddChild(BloggingPermissions.Blogs.Delete, L("Permission:Delete"));
             blogs.AddChild(BloggingPermissions.Blogs.Create, L("Permission:Create"));
 
-            var posts = bloggingGroup.AddPermission(BloggingPermissions.Posts.Default, L("Permission:PostManagement"));
+            var posts = bloggingGroup.AddPermission(BloggingPermissions.Posts.Default, L("Permission:Posts"));
             posts.AddChild(BloggingPermissions.Posts.Update, L("Permission:Edit"));
             posts.AddChild(BloggingPermissions.Posts.Delete, L("Permission:Delete"));
             posts.AddChild(BloggingPermissions.Posts.Create, L("Permission:Create"));
 
-            var tags = bloggingGroup.AddPermission(BloggingPermissions.Tags.Default, L("Permission:Tag"));
+            var tags = bloggingGroup.AddPermission(BloggingPermissions.Tags.Default, L("Permission:Tags"));
             tags.AddChild(BloggingPermissions.Tags.Update, L("Permission:Edit"));
             tags.AddChild(BloggingPermissions.Tags.Delete, L("Permission:Delete"));
             tags.AddChild(BloggingPermissions.Tags.Create, L("Permission:Create"));

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/Blogs/IBlogAppService.cs

@@ -12,5 +12,7 @@ namespace Volo.Blogging.Blogs
         Task<BlogDto> GetByShortNameAsync(string shortName);
 
         Task<BlogDto> GetAsync(Guid id);
+
+        Task Create(BlogDto blog);
     }
 }

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/Localization/ApplicationContracts/en.json

@@ -0,0 +1,13 @@
+{
+  "culture": "en",
+  "texts": {
+    "Permission:Blogging": "Blog",
+    "Permission:Blogs": "Blogs",
+    "Permission:Posts": "Posts",
+    "Permission:Tags": "Tags",
+    "Permission:Comments": "Comments",
+    "Permission:Edit": "Edit",
+    "Permission:Create": "Create",
+    "Permission:Delete": "Delete"
+  }
+}

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/Localization/ApplicationContracts/tr.json

@@ -0,0 +1,13 @@
+{
+  "culture": "tr",
+  "texts": {
+    "Permission:Blogging": "Blog",
+    "Permission:Blogs": "Bloglar",
+    "Permission:Posts": "Yazılar",
+    "Permission:Tags": "Etiketler",
+    "Permission:Comments": "Yorumlar",
+    "Permission:Edit": "Düzenke",
+    "Permission:Create": "Ekle",
+    "Permission:Delete": "Sil"
+  }
+}

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Blogs/BlogAppService.cs

@@ -42,5 +42,10 @@ namespace Volo.Blogging.Blogs
 
             return ObjectMapper.Map<Blog, BlogDto>(blog);
         }
+
+        public async Task Create(BlogDto blog)
+        {
+            await _blogRepository.InsertAsync(new Blog(GuidGenerator.Create(), blog.Name, blog.ShortName));
+        }
     }
 }

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml

@@ -12,6 +12,12 @@
 <ul>
     @foreach (var blog in Model.Blogs)
     {
-       <li><a asp-page="./Posts/Index" asp-route-blogShortName="@blog.ShortName">@blog.Name</a></li>
+        <li><a asp-page="./Posts/Index" asp-route-blogShortName="@blog.ShortName">@blog.Name</a></li>
     }
 </ul>
+
+<br/>
+<br/>
+<br/>
+
+<abp-dynamic-form abp-model="Blog" submit-button="true"/>

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml.cs

@@ -12,6 +12,9 @@ namespace Volo.Blogging.Pages.Blog
 
         public IReadOnlyList<BlogDto> Blogs { get; private set; }
 
+        [BindProperty]
+        public BlogDto Blog { get; set; }
+
         public IndexModel(IBlogAppService blogAppService)
         {
             _blogAppService = blogAppService;
@@ -19,6 +22,24 @@ namespace Volo.Blogging.Pages.Blog
 
         public async Task<IActionResult> OnGetAsync()
         {
+            var result = await _blogAppService.GetListAsync();
+
+            if (result.Items.Count == 1)
+            {
+                var blog = result.Items[0];
+                return RedirectToPage("./Posts/Index", new { blogShortName = blog.ShortName });
+            }
+
+            Blogs = result.Items;
+
+            return Page();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            await _blogAppService.Create(Blog);
+
+
             var result = await _blogAppService.GetListAsync();
 
             if (result.Items.Count == 1)