From e2c708259f805e373c13cde73ce3732295cee991 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 3 Jul 2018 13:41:00 +0300 Subject: [PATCH 1/9] button tag helper demo improvements --- .../Pages/Components/Buttons.cshtml | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml index 11464b53cc..7c87bca7fc 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml @@ -12,7 +12,7 @@
- Default + Primary Secondary Success @@ -25,7 +25,7 @@ 
-<abp-button>Default</abp-button>
+<abp-button text="Default"/>
 <abp-button button-type="Primary">Primary</abp-button>
 <abp-button button-type="Secondary">Secondary</abp-button>
 <abp-button button-type="Success">Success</abp-button>
@@ -44,7 +44,7 @@
 

     

         Link
-        Button
+        
         
         
         
@@ -52,10 +52,51 @@
     

         
 <a abp-button="Primary" href="#">Link</a>
-<abp-button button-type="Primary" type="submit">Button</abp-button>
+<abp-button button-type="Primary" type="submit" text="Button"/>
 <input abp-button="Primary" value="Input" />
 <input abp-button="Primary" type="submit" value="Submit" />
 <input abp-button="Primary" type="reset" value="Reset" />
+

+    

+

+
+
# Example

+
+

+    

+        
+        
+    

+    

+        
+<abp-button size="Large" text="Large"/>
+<abp-button size="Small" text="Small"/>
+

+    

+

+
+
# Example

+
+

+    

+        
+    

+    

+        
+<abp-button icon-type="FontAwesome" icon="info" text="With Icon"/>
+

+    

+

+
+
# Example

+
+

+    

+        
+    

+    

+        
+<abp-button text="Busy" busy-text="Saving..."/>
 

     

 

\ No newline at end of file

From d77901f8cd26d435fbf2a0c8b1bdacef072453b9 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan 
Date: Tue, 3 Jul 2018 13:49:15 +0300
Subject: [PATCH 2/9] cards tag helper demo link fix

---
 .../Pages/Components/Cards.cshtml                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
index 194ca96ad8..f56ccf68ae 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
@@ -100,10 +100,10 @@
                         Active
                     
                     
  • 
-                        Link
+                        Link
                     
    • 
                     
  • 
-                        Disabled
+                        Disabled
                     
    • 
                 
             
@@ -122,10 +122,10 @@
                 <a class="nav-link active" href="#">Active</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="#">Link</a>
+                <a class="nav-link" href="#link">Link</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link disabled" href="#">Disabled</a>
+                <a class="nav-link disabled" href="#disabledlink">Disabled</a>
             </li>
         </ul>
     </abp-card-header>

From 0e8c0a95a5273a016f1a8dc5bcfabc98588ed485 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan 
Date: Tue, 3 Jul 2018 13:55:56 +0300
Subject: [PATCH 3/9] badge tag helper demo broken link fixed

---
 .../Pages/Components/Badges.cshtml                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
index ee5ea9b293..3aba49624f 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
@@ -6,7 +6,7 @@
 
 
    Badges
    
 
-
    Based on  Bootstrap Badge.
    
+
    Based on  Bootstrap Badge.
    
 
 
    # Badges Examples
    
 

From 324fd7d0af5a56dd9e34c0a78d2eaaedd976afa5 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan 
Date: Tue, 3 Jul 2018 14:03:32 +0300
Subject: [PATCH 4/9] Added integration test tutorial.

---
 docs/Tutorials/AspNetCore-Mvc/Part-I.md       |  20 +-
 docs/Tutorials/AspNetCore-Mvc/Part-II.md      |  10 +-
 docs/Tutorials/AspNetCore-Mvc/Part-III.md     | 205 +++++++++++++++++-
 .../images/bookstore-add-create-dialog.png    | Bin
 .../images/bookstore-add-edit-dialog.png      | Bin
 .../images/bookstore-add-index-page.png       | Bin
 .../images/bookstore-book-list.png            | Bin
 .../images/bookstore-books-table-actions.png  | Bin
 .../images/bookstore-books-table.png          | Bin
 .../images/bookstore-create-dialog.png        | Bin
 .../images/bookstore-create-template.png      | Bin
 .../images/bookstore-homepage.png             | Bin
 .../images/bookstore-index-js-file.png        | Bin
 .../images/bookstore-localization-files.png   | Bin
 .../images/bookstore-menu-items.png           | Bin
 .../images/bookstore-new-book-button.png      | Bin
 .../bookstore-pmc-add-book-migration.png      | Bin
 .../images/bookstore-swagger.png              | Bin
 .../bookstore-test-js-proxy-getlist.png       | Bin
 .../images/bookstore-test-projects.png        | Bin 0 -> 7399 bytes
 .../images/bookstore-user-management.png      | Bin
 .../bookstore-visual-studio-solution.png      | Bin
 .../BookAppService_Tests.cs                   |  70 ++++++
 .../BookStoreTestDataBuilder.cs               |  32 ++-
 24 files changed, 319 insertions(+), 18 deletions(-)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-add-create-dialog.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-add-edit-dialog.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-add-index-page.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-book-list.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-books-table-actions.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-books-table.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-create-dialog.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-create-template.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-homepage.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-index-js-file.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-localization-files.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-menu-items.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-new-book-button.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-pmc-add-book-migration.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-swagger.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-test-js-proxy-getlist.png (100%)
 create mode 100644 docs/Tutorials/AspNetCore-Mvc/images/bookstore-test-projects.png
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-user-management.png (100%)
 rename docs/{ => Tutorials/AspNetCore-Mvc}/images/bookstore-visual-studio-solution.png (100%)
 create mode 100644 samples/BookStore/test/Acme.BookStore.Application.Tests/BookAppService_Tests.cs

diff --git a/docs/Tutorials/AspNetCore-Mvc/Part-I.md b/docs/Tutorials/AspNetCore-Mvc/Part-I.md
index 290c0a558e..43fbf7b500 100644
--- a/docs/Tutorials/AspNetCore-Mvc/Part-I.md
+++ b/docs/Tutorials/AspNetCore-Mvc/Part-I.md
@@ -20,7 +20,7 @@ This tutorial assumes that you have created a new project, named `Acme.BookStore
 
 This is the layered solution structure created from the startup template:
 
-![bookstore-visual-studio-solution](../../images/bookstore-visual-studio-solution.png)
+![bookstore-visual-studio-solution](images/bookstore-visual-studio-solution.png)
 
 ### Create the Book Entity
 
@@ -95,7 +95,7 @@ public class BookStoreDbContext : AbpDbContext
 
 Startup template uses [EF Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) to create and maintain the database schema. Open the **Package Manager Console (PMC)**, select the `Acme.BookStore.EntityFrameworkCore` as the **default project** and execute the following command:
 
-![bookstore-pmc-add-book-migration](../../images/bookstore-pmc-add-book-migration.png)
+![bookstore-pmc-add-book-migration](images/bookstore-pmc-add-book-migration.png)
 
 This will create a new migration class inside the `Migrations` folder. Then execute the `Update-Database` command to update the database schema:
 
@@ -107,7 +107,7 @@ PM> Update-Database
 
 `Update-Database` command created the `Books` table in the database. Enter a few sample rows, so you can show them on the page:
 
-![bookstore-books-table](../../images/bookstore-books-table.png)
+![bookstore-books-table](images/bookstore-books-table.png)
 
 ### Create the Application Service
 
@@ -247,7 +247,7 @@ ABP can automatically configures your application services as MVC API Controller
 
 The startup template is configured to run the [swagger UI](https://swagger.io/tools/swagger-ui/) using the [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) library. Run the application and enter `http://localhost:53929/swagger/` as URL on your browser:
 
-![bookstore-swagger](../../images/bookstore-swagger.png)
+![bookstore-swagger](images/bookstore-swagger.png)
 
 You will see some built-in service endpoints as well as the `Book` service and its REST-style endpoints.
 
@@ -273,7 +273,7 @@ acme.bookStore.book.getList({}).done(function (result) { console.log(result); })
 
 Running this code produces such an output:
 
-![bookstore-test-js-proxy-getlist](../../images/bookstore-test-js-proxy-getlist.png)
+![bookstore-test-js-proxy-getlist](images/bookstore-test-js-proxy-getlist.png)
 
 You can see the **book list** returned from the server.
 
@@ -297,7 +297,7 @@ It's time to create something visible! Instead of classic MVC, we will use the n
 
 Create a new `Books` folder under the `Pages` folder of the `Acme.BookStore.Web` project and add a new Razor Page named `Index.html`:
 
-![bookstore-add-index-page](../../images/bookstore-add-index-page.png)
+![bookstore-add-index-page](images/bookstore-add-index-page.png)
 
 Open the `Index.cshtml` and change the content as shown below:
 
@@ -327,7 +327,7 @@ context.Menu.AddItem(
 
 Localization texts are located under the `Localization/BookStore` folder of the `Acme.BookStore.Domain` project:
 
-![bookstore-localization-files](../../images/bookstore-localization-files.png)
+![bookstore-localization-files](images/bookstore-localization-files.png)
 
 Open the `en.json` file and add localization texts for `Menu:BookStore` and `Menu:Books`  keys:
 
@@ -347,7 +347,7 @@ Open the `en.json` file and add localization texts for `Menu:BookStore` and `Men
 
 Run the application and see the menu items are added to the top bar:
 
-![bookstore-menu-items](../../images/bookstore-menu-items.png)
+![bookstore-menu-items](images/bookstore-menu-items.png)
 
 When you click to the Books menu item, you are redirected to the new Books page.
 
@@ -396,7 +396,7 @@ Change the `Pages/Books/Index.cshtml` as following:
 
 Create `index.js` JavaScript file under the `wwwroot/pages/books/` folder:
 
-![bookstore-index-js-file](../../images/bookstore-index-js-file.png)
+![bookstore-index-js-file](images/bookstore-index-js-file.png)
 
 `index.js` content is shown below:
 
@@ -436,7 +436,7 @@ $(function() {
 
 The final UI is shown below:
 
-![bookstore-book-list](../../images/bookstore-book-list.png)
+![bookstore-book-list](images/bookstore-book-list.png)
 
 ### Next Part
 
diff --git a/docs/Tutorials/AspNetCore-Mvc/Part-II.md b/docs/Tutorials/AspNetCore-Mvc/Part-II.md
index 422e226d15..adcc389e7b 100644
--- a/docs/Tutorials/AspNetCore-Mvc/Part-II.md
+++ b/docs/Tutorials/AspNetCore-Mvc/Part-II.md
@@ -16,13 +16,13 @@ You can download the **source code** of the application [from here](https://gith
 
 In this section, you will learn how to create a new modal dialog form to create a new book. The result dialog will be like that:
 
-![bookstore-create-dialog](../../images/bookstore-create-dialog.png)
+![bookstore-create-dialog](images/bookstore-create-dialog.png)
 
 #### Create the Modal Form
 
 Create a new razor page, named `CreateModal.cshtml` under the `Pages/Books` folder of the `Acme.BookStore.Web` project:
 
-![bookstore-add-create-dialog](../../images/bookstore-add-create-dialog.png)
+![bookstore-add-create-dialog](images/bookstore-add-create-dialog.png)
 
 ##### CreateModal.cshtml.cs
 
@@ -110,7 +110,7 @@ Open the `Pages/Books/Index.cshtml` and change the `abp-card-header` tag as show
 
 Just added a **New book** button to the **top right** of the table:
 
-![bookstore-new-book-button](../../images/bookstore-new-book-button.png)
+![bookstore-new-book-button](images/bookstore-new-book-button.png)
 
 Open the `wwwroot/pages/books/index.js` and add the following code just after the datatable configuration:
 
@@ -135,7 +135,7 @@ Now, you can **run the application** and add new books using the new modal form.
 
 Create a new razor page, named `EditModal.cshtml` under the `Pages/Books` folder of the `Acme.BookStore.Web` project:
 
-![bookstore-add-edit-dialog](../../images/bookstore-add-edit-dialog.png)
+![bookstore-add-edit-dialog](images/bookstore-add-edit-dialog.png)
 
 #### EditModal.cshtml.cs
 
@@ -251,7 +251,7 @@ This page is very similar to the `CreateModal.cshtml` except;
 
 We will add a dropdown button ("Actions") for each row of the table. The final UI looks like this:
 
-![bookstore-books-table-actions](../../images/bookstore-books-table-actions.png)
+![bookstore-books-table-actions](images/bookstore-books-table-actions.png)
 
 Open the `Pages/Books/Index.cshtml` page and change the table section as shown below:
 
diff --git a/docs/Tutorials/AspNetCore-Mvc/Part-III.md b/docs/Tutorials/AspNetCore-Mvc/Part-III.md
index 18e006adf4..1b03bc8059 100644
--- a/docs/Tutorials/AspNetCore-Mvc/Part-III.md
+++ b/docs/Tutorials/AspNetCore-Mvc/Part-III.md
@@ -12,4 +12,207 @@ This is the third part of the tutorial series. See all parts:
 
 You can download the **source code** of the application [from here](https://github.com/volosoft/abp/tree/master/samples/BookStore).
 
-TODO...
\ No newline at end of file
+### Test Projects in the Solution
+
+There are two test projects in the solution:
+
+![bookstore-test-projects](images/bookstore-test-projects.png)
+
+* `Acme.BookStore.Application.Tests` is for unit & integration test projects. You can write tests for application services those are integrated to the framework. It uses **EF Core SQLite in-memory** database.
+* `Acme.BookStore.Web.Tests` is for full stack integration tests including the web layer. So, you can write tests for UI too.
+
+Test projects uses the following libraries for testing:
+
+* [xunit](https://xunit.github.io/) as the main test framework.
+* [Shoudly](http://shouldly.readthedocs.io/en/latest/) as an assertion library.
+* [NSubstitute](http://nsubstitute.github.io/) as a mocking library.
+
+### Adding Test Data
+
+Startup template contains the `BookStoreTestDataBuilder` class in the `Acme.BookStore.Application.Tests` project that creates some data to run tests on. It's shown below:
+
+````C#
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore
+{
+    public class BookStoreTestDataBuilder : ITransientDependency
+    {
+        private readonly IIdentityDataSeeder _identityDataSeeder;
+
+        public BookStoreTestDataBuilder(IIdentityDataSeeder identityDataSeeder)
+        {
+            _identityDataSeeder = identityDataSeeder;
+        }
+
+        public void Build()
+        {
+            AsyncHelper.RunSync(BuildInternalAsync);
+        }
+
+        public async Task BuildInternalAsync()
+        {
+            await _identityDataSeeder.SeedAsync("1q2w3E*");
+        }
+    }
+}
+````
+
+* It simply uses `IIdentityDataSeeder` which is implemented by the identity module and creates an admin role and admin user. You can use them in the tests.
+
+Change the `BookStoreTestDataBuilder` class as show below:
+
+````C#
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Identity;
+using Volo.Abp.Threading;
+
+namespace Acme.BookStore
+{
+    public class BookStoreTestDataBuilder : ITransientDependency
+    {
+        private readonly IIdentityDataSeeder _identityDataSeeder;
+        private readonly IRepository _bookRepository;
+
+        public BookStoreTestDataBuilder(
+            IIdentityDataSeeder identityDataSeeder,
+            IRepository bookRepository)
+        {
+            _identityDataSeeder = identityDataSeeder;
+            _bookRepository = bookRepository;
+        }
+
+        public void Build()
+        {
+            AsyncHelper.RunSync(BuildInternalAsync);
+        }
+
+        public async Task BuildInternalAsync()
+        {
+            await _identityDataSeeder.SeedAsync("1q2w3E*");
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "Test book 1",
+                    Type = BookType.Fantastic,
+                    PublishDate = new DateTime(2015, 05, 24),
+                    Price = 21
+                }
+            );
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "Test book 2",
+                    Type = BookType.Science,
+                    PublishDate = new DateTime(2014, 02, 11),
+                    Price = 15
+                }
+            );
+        }
+    }
+}
+````
+
+* Injected `IRepository` and used it in the `BuildInternalAsync` to create 2 book entities.
+
+### Testing the BookAppService
+
+Create a test class named `BookAppService_Tests` in the `Acme.BookStore.Application.Tests` project:
+
+````C#
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Application.Dtos;
+using Xunit;
+
+namespace Acme.BookStore
+{
+    public class BookAppService_Tests : BookStoreApplicationTestBase
+    {
+        private readonly IBookAppService _bookAppService;
+
+        public BookAppService_Tests()
+        {
+            _bookAppService = GetRequiredService();
+        }
+
+        [Fact]
+        public async Task Should_Get_List_Of_Books()
+        {
+            //Act
+            var result = await _bookAppService.GetListAsync(
+                new PagedAndSortedResultRequestDto()
+            );
+
+            //Assert
+            result.TotalCount.ShouldBeGreaterThan(0);
+            result.Items.ShouldContain(b => b.Name == "Test book 1");
+        }
+    }
+}
+````
+
+* `Should_Get_List_Of_Books` test simply uses `BookAppService.GetListAsync` method to get and check the list of users.
+
+Add a new test that creates a valid new book:
+
+````C#
+[Fact]
+public async Task Should_Create_A_Valid_Book()
+{
+    //Act
+    var result = await _bookAppService.CreateAsync(
+        new CreateUpdateBookDto
+        {
+            Name = "New test book 42",
+            Price = 10,
+            PublishDate = DateTime.Now,
+            Type = BookType.ScienceFiction
+        }
+    );
+
+    //Assert
+    result.Id.ShouldNotBe(Guid.Empty);
+    result.Name.ShouldBe("New test book 42");
+}
+````
+
+Add a new test that tries to create an invalid book and fails:
+
+````C#
+[Fact]
+public async Task Should_Not_Create_A_Book_Without_Name()
+{
+    var exception = await Assert.ThrowsAsync(async () =>
+    {
+        await _bookAppService.CreateAsync(
+            new CreateUpdateBookDto
+            {
+                Name = "",
+                Price = 10,
+                PublishDate = DateTime.Now,
+                Type = BookType.ScienceFiction
+            }
+        );
+    });
+
+    exception.ValidationErrors
+        .ShouldContain(err => err.MemberNames.Any(mem => mem == "Name"));
+}
+````
+
+* Since the `Name` is set as empty, ABP throws an `AbpValidationException`.
+
+### Testing Web Pages
+
+TODO
\ No newline at end of file
diff --git a/docs/images/bookstore-add-create-dialog.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog.png
similarity index 100%
rename from docs/images/bookstore-add-create-dialog.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog.png
diff --git a/docs/images/bookstore-add-edit-dialog.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-edit-dialog.png
similarity index 100%
rename from docs/images/bookstore-add-edit-dialog.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-edit-dialog.png
diff --git a/docs/images/bookstore-add-index-page.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-index-page.png
similarity index 100%
rename from docs/images/bookstore-add-index-page.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-add-index-page.png
diff --git a/docs/images/bookstore-book-list.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-book-list.png
similarity index 100%
rename from docs/images/bookstore-book-list.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-book-list.png
diff --git a/docs/images/bookstore-books-table-actions.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-books-table-actions.png
similarity index 100%
rename from docs/images/bookstore-books-table-actions.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-books-table-actions.png
diff --git a/docs/images/bookstore-books-table.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-books-table.png
similarity index 100%
rename from docs/images/bookstore-books-table.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-books-table.png
diff --git a/docs/images/bookstore-create-dialog.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-create-dialog.png
similarity index 100%
rename from docs/images/bookstore-create-dialog.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-create-dialog.png
diff --git a/docs/images/bookstore-create-template.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-create-template.png
similarity index 100%
rename from docs/images/bookstore-create-template.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-create-template.png
diff --git a/docs/images/bookstore-homepage.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-homepage.png
similarity index 100%
rename from docs/images/bookstore-homepage.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-homepage.png
diff --git a/docs/images/bookstore-index-js-file.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-index-js-file.png
similarity index 100%
rename from docs/images/bookstore-index-js-file.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-index-js-file.png
diff --git a/docs/images/bookstore-localization-files.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-localization-files.png
similarity index 100%
rename from docs/images/bookstore-localization-files.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-localization-files.png
diff --git a/docs/images/bookstore-menu-items.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-menu-items.png
similarity index 100%
rename from docs/images/bookstore-menu-items.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-menu-items.png
diff --git a/docs/images/bookstore-new-book-button.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-new-book-button.png
similarity index 100%
rename from docs/images/bookstore-new-book-button.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-new-book-button.png
diff --git a/docs/images/bookstore-pmc-add-book-migration.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-pmc-add-book-migration.png
similarity index 100%
rename from docs/images/bookstore-pmc-add-book-migration.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-pmc-add-book-migration.png
diff --git a/docs/images/bookstore-swagger.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-swagger.png
similarity index 100%
rename from docs/images/bookstore-swagger.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-swagger.png
diff --git a/docs/images/bookstore-test-js-proxy-getlist.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-test-js-proxy-getlist.png
similarity index 100%
rename from docs/images/bookstore-test-js-proxy-getlist.png
rename to docs/Tutorials/AspNetCore-Mvc/images/bookstore-test-js-proxy-getlist.png
diff --git a/docs/Tutorials/AspNetCore-Mvc/images/bookstore-test-projects.png b/docs/Tutorials/AspNetCore-Mvc/images/bookstore-test-projects.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9511d7b11c359a1a52408f9b80c3f78c58b4875
GIT binary patch
literal 7399
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
+        }
+
+        [Fact]
+        public async Task Should_Get_List_Of_Books()
+        {
+            //Act
+            var result = await _bookAppService.GetListAsync(new PagedAndSortedResultRequestDto());
+
+            //Assert
+            result.TotalCount.ShouldBeGreaterThan(0);
+            result.Items.ShouldContain(b => b.Name == "Test book 1");
+        }
+
+        [Fact]
+        public async Task Should_Create_A_Valid_Book()
+        {
+            //Act
+            var result = await _bookAppService.CreateAsync(
+                new CreateUpdateBookDto
+                {
+                    Name = "New test book 42",
+                    Price = 10,
+                    PublishDate = DateTime.Now,
+                    Type = BookType.ScienceFiction
+                }
+            );
+
+            //Assert
+            result.Id.ShouldNotBe(Guid.Empty);
+            result.Name.ShouldBe("New test book 42");
+        }
+
+        [Fact]
+        public async Task Should_Not_Create_A_Book_Without_Name()
+        {
+            var exception = await Assert.ThrowsAsync(async () =>
+            {
+                await _bookAppService.CreateAsync(
+                    new CreateUpdateBookDto
+                    {
+                        Name = "",
+                        Price = 10,
+                        PublishDate = DateTime.Now,
+                        Type = BookType.ScienceFiction
+                    }
+                );
+            });
+
+            exception.ValidationErrors
+                .ShouldContain(err => err.MemberNames.Any(mem => mem == "Name"));
+        }
+    }
+}
diff --git a/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreTestDataBuilder.cs b/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreTestDataBuilder.cs
index 9881b7e7be..d29cad952f 100644
--- a/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreTestDataBuilder.cs
+++ b/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreTestDataBuilder.cs
@@ -1,5 +1,7 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 
@@ -8,10 +10,14 @@ namespace Acme.BookStore
     public class BookStoreTestDataBuilder : ITransientDependency
     {
         private readonly IIdentityDataSeeder _identityDataSeeder;
+        private readonly IRepository _bookRepository;
 
-        public BookStoreTestDataBuilder(IIdentityDataSeeder identityDataSeeder)
+        public BookStoreTestDataBuilder(
+            IIdentityDataSeeder identityDataSeeder,
+            IRepository bookRepository)
         {
             _identityDataSeeder = identityDataSeeder;
+            _bookRepository = bookRepository;
         }
 
         public void Build()
@@ -22,6 +28,28 @@ namespace Acme.BookStore
         public async Task BuildInternalAsync()
         {
             await _identityDataSeeder.SeedAsync("1q2w3E*");
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "Test book 1",
+                    Type = BookType.Fantastic,
+                    PublishDate = new DateTime(2015, 05, 24),
+                    Price = 21
+                }
+            );
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "Test book 2",
+                    Type = BookType.Science,
+                    PublishDate = new DateTime(2014, 02, 11),
+                    Price = 15
+                }
+            );
         }
     }
 }
\ No newline at end of file

From 59689952314c7814d9176fc3618799e343d9f602 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan 
Date: Tue, 3 Jul 2018 14:10:44 +0300
Subject: [PATCH 5/9] Modal tag helper improvements

---
 .../TagHelpers/Modal/AbpModalTagHelperService.cs    | 13 +++++++++----
 .../Pages/Components/Modals.cshtml                  | 11 ++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
index 7c854baef1..138f670902 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
@@ -1,4 +1,6 @@
-using System.Text;
+using System;
+using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
@@ -8,15 +10,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
             output.TagName = null;
-            output.PreContent.SetHtmlContent(CreatePreContent());
+            output.PreContent.SetHtmlContent(CreatePreContent(output));
             output.PostContent.SetHtmlContent(CreatePostContent());
         }
 
-        protected virtual string CreatePreContent()
+        protected virtual string CreatePreContent(TagHelperOutput output)
         {
             var sb = new StringBuilder();
 
-            sb.AppendLine("
    ");
+            var attritubutes = output.Attributes.Select(a => " " + a.Name + "=\"" + a.Value + "\" ").ToList();
+            var attritubutesAsJoin = String.Join(" ", attritubutes.ToArray()); 
+
+            sb.AppendLine("
    ");
             sb.AppendLine("    
    ");
             sb.AppendLine("        
    ");
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
index d1548826b2..d4892c5d66 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
@@ -7,17 +7,18 @@
 
 
    Modals
    
 
-
    Based on  Bootstrap Modal.
    
+
    Based on  Bootstrap Modal.
    
 
 
    # Modal Example
    
 
 
    
     
    
+        Launch modal
+
+        
 
-        
-            
             
-            
+
             
                 Body
             
@@ -29,7 +30,7 @@
     
    
     
    
         
    -<abp-modal>
+<abp-modal id="myModal">
    <abp-modal-header title="Header"></abp-modal-header>
    <abp-modal-body>
        Body

From 478b4752d0eda4363e8bbdafaeaf2ac95787c199 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan 
Date: Tue, 3 Jul 2018 14:19:31 +0300
Subject: [PATCH 6/9] modal tag helper minor refactor

---
 .../TagHelpers/Modal/AbpModalTagHelperService.cs             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
index 138f670902..23453df1d0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
@@ -19,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             var sb = new StringBuilder();
 
             var attritubutes = output.Attributes.Select(a => " " + a.Name + "=\"" + a.Value + "\" ").ToList();
-            var attritubutesAsJoin = String.Join(" ", attritubutes.ToArray()); 
+            var attritubutesAsJoin = string.Join(" ", attritubutes.ToArray()); 
 
             sb.AppendLine("
    ");
             sb.AppendLine("    
    ");

From be7696cccc360596ec220cf1128d31a38ec4b00b Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan 
Date: Tue, 3 Jul 2018 14:43:36 +0300
Subject: [PATCH 7/9] Remove embedded resource from contents

---
 .../src/Volo.Blogging.Web/Volo.Blogging.Web.csproj  |  7 +++++--
 modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj | 11 +++++++++++
 .../Volo.Abp.TenantManagement.Web.csproj            | 13 ++++++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
index ee579b03ca..042a6023e7 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
+++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj
@@ -28,8 +28,11 @@
   
 
   
-    
-    
+    
+    
+    
+    
+    
   
 
 
diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj
index 97b44a489c..e98734642d 100644
--- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj
+++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj
@@ -22,5 +22,16 @@
     
     
   
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
   
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
index b672ed2438..94071ed59e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj
@@ -1,4 +1,4 @@
-
+
 
   
 
@@ -17,6 +17,17 @@
     
   
 
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
   
     
 

From 1814167da2e766ca954942961955c46738b9aee4 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan 
Date: Tue, 3 Jul 2018 14:46:51 +0300
Subject: [PATCH 8/9] Increment version to 0.3.5.

---
 common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.props b/common.props
index 48e20853bf..2c7058128c 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 
   
     latest
-    0.3.4
+    0.3.5
     $(NoWarn);CS1591
     http://www.aspnetboilerplate.com/images/abp_nupkg.png
     http://abp.io

From 103455a5ec14cd5fe71b3d04fca2b47b6fa43dcd Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan 
Date: Tue, 3 Jul 2018 15:07:38 +0300
Subject: [PATCH 9/9] Tag helper demo css

---
 .../Pages/Components/Alerts.cshtml            |  6 +++
 .../Pages/Components/Badges.cshtml            | 10 +++-
 .../Pages/Components/Blockquotes.cshtml       |  6 +++
 .../Pages/Components/Borders.cshtml           |  6 +++
 .../Pages/Components/Breadcrumbs.cshtml       | 12 +++--
 .../Pages/Components/Buttons.cshtml           | 20 ++++---
 .../Pages/Components/Cards.cshtml             | 17 +++---
 .../Pages/Components/Carousel.cshtml          |  6 +++
 .../Pages/Components/Collapse.cshtml          | 10 +++-
 .../Pages/Components/Dropdowns.cshtml         | 18 ++++---
 .../Pages/Components/DynamicForms.cshtml      |  8 ++-
 .../Pages/Components/Grids.cshtml             |  6 +++
 .../Pages/Components/Images.cshtml            |  6 +++
 .../Pages/Components/ListGroup.cshtml         |  6 +++
 .../Pages/Components/Modals.cshtml            |  6 +++
 .../Pages/Components/Navs.cshtml              |  6 +++
 .../Pages/Components/Paginator.cshtml         |  6 +++
 .../Pages/Components/Popovers.cshtml          |  6 +++
 .../Pages/Components/ProgressBars.cshtml      | 12 +++--
 .../Pages/Components/Tables.cshtml            | 54 ++++++++++---------
 .../Pages/Components/Tabs.cshtml              | 14 +++--
 .../Pages/Components/Tooltips.cshtml          |  6 +++
 .../wwwroot/css/demo.scss                     |  3 +-
 23 files changed, 186 insertions(+), 64 deletions(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
index 37367dd4bc..d2356bf771 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Alerts";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Alerts
    
 
 
    Based on  Bootstrap Alert.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
index 3aba49624f..d5352312a7 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Badges.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Badges";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Badges
    
 
 
    Based on  Bootstrap Badge.
    
@@ -13,8 +19,8 @@
 
    
     
    
 
-        I'm an abp badge!
-        I'm an abp pill badge!
+        I'm an abp badge!
+        I'm an abp pill badge!
         I'm an abp badge link!
         I'm an abp pill badge link!
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Blockquotes.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Blockquotes.cshtml
index fb7f2b990f..4f8b1c3a5f 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Blockquotes.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Blockquotes.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Badges";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Blockquotes
    
 
 
    Based on  Bootstrap Blockquotes.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Borders.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Borders.cshtml
index 14cedaff07..0f59a257eb 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Borders.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Borders.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Borders";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Borders
    
 
 
    Based on  Bootstrap Border.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Breadcrumbs.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Breadcrumbs.cshtml
index 59e94a0fca..e3ab71b246 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Breadcrumbs.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Breadcrumbs.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Breadcrumbs";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Breadcrumbs
    
 
 
    Based on  Bootstrap Breadcrumb.
    
@@ -14,9 +20,9 @@
     
    
 
         
-            
-            
-            
+            
+            
+            
         
 
     
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml
index 7c87bca7fc..ce2cb2d42d 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Buttons.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Buttons";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Buttons
    
 
 
    Based on  Bootstrap button.
    
@@ -12,7 +18,7 @@
 
 
    
     
    
-        
+        
         Primary
         Secondary
         Success
@@ -42,9 +48,9 @@
 
    # Example
    
 
 
    
-    
    
+    
    
         Link
-        
+        
         
         
         
@@ -64,8 +70,8 @@
 
 
    
     
    
-        
-        
+        
+        
     
    
     
    
         
    @@ -79,7 +85,7 @@
 
 
    
     
    
-        
+        
     
    
     
    
         
    @@ -92,7 +98,7 @@
 
 
    
     
    
-        
+        
     
    
     
    
         
    diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
index f56ccf68ae..4f23e041f8 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Cards.cshtml
@@ -4,19 +4,14 @@
     ViewData["Title"] = "Cards";
 }
 
-
    Cards
    
+@section styles {
+    
+        
+    
+}
 
-@*
-    
    # Example
    
+
    Cards
    
 
-    
    
-        
    
-        
    
-        
    
-    
    
-        
    
-    
    
-*@
 
 
    Based on  Bootstrap card.
    
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Carousel.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Carousel.cshtml
index c36abe3728..2ea6fa3f60 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Carousel.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Carousel.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Carousels";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Carousels
    
 
 
    Based on  Bootstrap Carousel.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Collapse.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Collapse.cshtml
index 644df447d7..adbe35a3fa 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Collapse.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Collapse.cshtml
@@ -5,6 +5,12 @@
     ViewData["Title"] = "Collapse";
 }
 
+
+@section styles {
+    
+        
+    
+}
 
    Collapse
    
 
 
    Based on  Bootstrap Collapse.
    
@@ -48,13 +54,13 @@
 
 
    
     
    
-        
+
         
    
             
                 Toggle
             
         
    
-        
+
         
             3Anim pariatur  wolf moon tempor,,, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
         
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Dropdowns.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Dropdowns.cshtml
index eedef519ce..7604f18abc 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Dropdowns.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Dropdowns.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Dropdowns";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Dropdowns
    
 
 
    Based on  Bootstrap button.
    
@@ -14,13 +20,13 @@
     
    
 
         
-            
+            
             
                 Dropdown header
                 Action
                 Another disabled action
                 Something else here
-                
+                
                 Separated link
             
         
@@ -49,13 +55,13 @@
     
    
 
         
-            
+            
             
                 Dropdown header
                 Action
                 Another disabled action
                 Something else here
-                
+                
                 Separated link
             
         
@@ -84,13 +90,13 @@
     
    
 
         
-            
+            
             
                 Dropdown header
                 Action
                 Another disabled action
                 Something else here
-                
+                
                 Separated link
             
         
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
index 745bc3befa..87d4c75a84 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml
@@ -6,13 +6,19 @@
     ViewData["Title"] = "Forms";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Dynamic Forms
    
 
 
    # Dynamic Form Example
    
 
 
    
     
    
-        
+        
         
    
         
    Posted Values:
    
         
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml
index aa12bf5431..4957fd3636 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Grids";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Grids
    
 
 
    Based on  Bootstrap grid.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Images.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Images.cshtml
index 693160844c..9ec4f0106e 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Images.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Images.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Images";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Images
    
 
 
    Based on  Bootstrap Images.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ListGroup.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ListGroup.cshtml
index d0f107cf7f..90097a3c4d 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ListGroup.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ListGroup.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "List Groups";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    List Groups
    
 
 
    Based on  Bootstrap List Group.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
index d4892c5d66..0a3aa3d8b9 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml
@@ -5,6 +5,12 @@
     ViewData["Title"] = "Modals";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Modals
    
 
 
    Based on  Bootstrap Modal.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Navs.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Navs.cshtml
index 1edd06dd09..d351878652 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Navs.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Navs.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Navs";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Navs
    
 
 
    Based on  Bootstrap Navs.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Paginator.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Paginator.cshtml
index 2d40ca5416..bcf117945c 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Paginator.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Paginator.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Paginator";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Paginator
    
 
 
    # Paginator Examples
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
index 954008260a..f9563a5c8b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Badges";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Popovers
    
 
 
    Based on  Bootstrap Popovers.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ProgressBars.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ProgressBars.cshtml
index 08c5a18fb3..563e23a9c8 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ProgressBars.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/ProgressBars.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Progress Bars";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Progress Bars
    
 
 
    Based on  Bootstrap Progress Bars.
    
@@ -14,8 +20,8 @@
     
    
 
         
-            
-            
+            
+
         
         
    
         
@@ -30,7 +36,7 @@
         
         
    
         
-            
+            
                 %50
             
         
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml
index d083d1e40d..127cd61715 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tables.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Tables";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Tables
    
 
 
    Based on  Bootstrap Tables.
    
@@ -15,32 +21,32 @@
 
         
             
-            
-                #
-                First
-                Last
-                Handle
-            
+                
+                    #
+                    First
+                    Last
+                    Handle
+                
             
             
-            
-                1
-                Mark
-                Otto
-                mdo
-            
-            
-                2
-                Jacob
-                Thornton
-                fat
-            
-            
-                3
-                Larry
-                the Bird
-                twitter
-            
+                
+                    1
+                    Mark
+                    Otto
+                    mdo
+                
+                
+                    2
+                    Jacob
+                    Thornton
+                    fat
+                
+                
+                    3
+                    Larry
+                    the Bird
+                    twitter
+                
             
         
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tabs.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tabs.cshtml
index f821994e3f..1baa0047e1 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tabs.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tabs.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Tabs";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Tabs
    
 
 
    Based on  Bootstrap tab.
    
@@ -15,7 +21,7 @@
         
             
                 Content_Home
-               
+            
             
                 Content_Profile
             
@@ -48,7 +54,7 @@
         
             
                 Content_Home
-               
+            
             
                 Content_Profile
             
@@ -81,7 +87,7 @@
         
             
                 Content_Home
-               
+            
             
                 Content_Profile
             
@@ -114,7 +120,7 @@
         
             
                 Content_Home
-               
+            
             
                 Content_Profile
             
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tooltips.cshtml b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tooltips.cshtml
index a85d70e159..fe0aeebae4 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tooltips.cshtml
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Tooltips.cshtml
@@ -4,6 +4,12 @@
     ViewData["Title"] = "Badges";
 }
 
+@section styles {
+    
+        
+    
+}
+
 
    Tooltips
    
 
 
    Based on  Bootstrap Tooltips.
    
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/css/demo.scss b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/css/demo.scss
index b37214bf94..c9c78fa28b 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/css/demo.scss
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/css/demo.scss
@@ -1,15 +1,16 @@
 .demo-with-code {
-
     padding-bottom: 10px;
     margin-bottom: 10px;
 
     .demo-area {
+        margin-top: 20px;
         margin-bottom: 1em;
     }
 
     .code-area {
         border: 1px solid #ddd;
         padding: 10px;
+        margin-top: 10px;
         font-size: 0.9em;
     }
 }