Merge branch 'dev' into liangshiwei/mongodb

docs/en/Getting-Started-Create-Solution.md

@@ -8,6 +8,19 @@
     "Tiered": ["Yes", "No"]
 }
 ````
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Running the solution",
+    "Path": "Getting-Started-Running-Solution"
+  },
+  "Previous": {
+    "Name": "Setup Your Development Environment",
+    "Path": "Getting-Started-Setup-Environment"
+  }
+}
+````
 
 > This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
 
@@ -66,8 +79,4 @@ Configure<AbpUnitOfWorkDefaultOptions>(options =>
 
 > Or you can delete that code since `Auto` is already the default behavior.
 
-{{ end }}
+{{ end }}
-
-## Next Step
-
-* [Running the solution](Getting-Started-Running-Solution.md)

docs/en/Getting-Started-Running-Solution-Single-Layer.md

@@ -8,6 +8,16 @@
 }
 ````
 
+````json
+//[doc-nav]
+{
+  "Previous": {
+    "Name": "Creating a new solution",
+    "Path": "Getting-Started-Create-Solution-Single-Layer"
+  }
+}
+````
+
 > This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
 
 ## Create the Database

docs/en/Getting-Started-Running-Solution.md

@@ -9,6 +9,16 @@
 }
 ````
 
+````json
+//[doc-nav]
+{
+  "Previous": {
+    "Name": "Creating a new solution",
+    "Path": "Getting-Started-Create-Solution"
+  }
+}
+````
+
 > This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
 
 ## Create the Database
@@ -258,9 +268,4 @@ It may take a longer time for the first build. Once it finishes, it opens the An
 
 {{ end }}
 
-Enter **admin** as the username and **1q2w3E*** as the password to login to the application. The application is up and running. You can start developing your application based on this startup template.
+Enter **admin** as the username and **1q2w3E*** as the password to login to the application. The application is up and running. You can start developing your application based on this startup template.
-
-## See Also
-
-* [Web Application Development Tutorial](Tutorials/Part-1.md)
-* [Application Startup Template](Startup-Templates/Application.md)

docs/en/Getting-Started-Setup-Environment-Single-Layer.md

@@ -8,6 +8,16 @@
 }
 ````
 
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Creating a new solution",
+    "Path": "Getting-Started-Create-Solution-Single-Layer"
+  }
+}
+````
+
 > This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
 
 ## Setup Your Development Environment
@@ -42,8 +52,4 @@ If you've already installed, you can update it using the following command:
 
 ````shell
 dotnet tool update -g Volo.Abp.Cli
-````
+````
-
-## Next Step
-
-* [Creating a new solution](Getting-Started-Create-Solution-Single-Layer.md)

docs/en/Getting-Started-Setup-Environment.md

@@ -8,6 +8,15 @@
     "Tiered": ["Yes", "No"]
 }
 ````
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Creating a new solution",
+    "Path": "Getting-Started-Create-Solution"
+  }
+}
+````
 
 > This document assumes that you prefer to use **{{ UI_Value }}** as the UI framework and **{{ DB_Value }}** as the database provider. For other options, please change the preference on top of this document.
 
@@ -46,8 +55,4 @@ If you've already installed, you can update it using the following command:
 
 ````shell
 dotnet tool update -g Volo.Abp.Cli
-````
+````
-
-## Next Step
-
-* [Creating a new solution](Getting-Started-Create-Solution.md)

docs/en/Tutorials/Part-1.md

@@ -6,6 +6,16 @@
     "DB": ["EF","Mongo"]
 }
 ````
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "The Book List Page",
+    "Path": "Tutorials/Part-2"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -510,8 +520,4 @@ If you try to execute the `[GET] /api/app/book` API to get a list of books, the
 }
 ````
 
-That's pretty cool since we haven't written a single line of code to create the API controller, but now we have a fully working REST API!
+That's pretty cool since we haven't written a single line of code to create the API controller, but now we have a fully working REST API!
-
-## The Next Part
-
-See the [next part](Part-2.md) of this tutorial.

docs/en/Tutorials/Part-10.md

@@ -6,6 +6,17 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Previous": {
+    "Name": "Authors: User Interface",
+    "Path": "Tutorials/Part-9"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:

docs/en/Tutorials/Part-2.md

@@ -6,6 +6,20 @@
     "DB": ["EF","Mongo"]
 }
 ````
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Creating, Updating and Deleting Books",
+    "Path": "Tutorials/Part-3"
+  },
+  "Previous": {
+    "Name": "Creating the Server Side",
+    "Path": "Tutorials/Part-1"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -668,7 +682,3 @@ You can run the application! The final UI of this part is shown below:
 This is a fully working, server side paged, sorted and localized table of books.
 
 {{end # UI }}
-
-## The Next Part
-
-Check the [next part](Part-3.md) of this tutorial.

docs/en/Tutorials/Part-3.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Integration Tests",
+    "Path": "Tutorials/Part-4"
+  },
+  "Previous": {
+    "Name": "The Book List Page",
+    "Path": "Tutorials/Part-2"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -1554,6 +1569,3 @@ Here's the complete code to create the book management CRUD page, that has been
 
 {{end}}
 
-## The Next Part
-
-Check out the [next part](Part-4.md) of this tutorial.

docs/en/Tutorials/Part-4.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Authorization",
+    "Path": "Tutorials/Part-5"
+  },
+  "Previous": {
+    "Name": "Creating, Updating and Deleting Books",
+    "Path": "Tutorials/Part-3"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -282,8 +297,4 @@ Open the **Test Explorer Window** (use Test -> Windows -> Test Explorer menu if
 
 ![bookstore-appservice-tests](./images/bookstore-appservice-tests.png)
 
-Congratulations, the **green icons** indicates that the tests have been successfully passed!
+Congratulations, the **green icons** indicates that the tests have been successfully passed!
-
-## The Next Part
-
-See the [next part](Part-5.md) of this tutorial.

docs/en/Tutorials/Part-5.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Authors: Domain Layer",
+    "Path": "Tutorials/Part-6"
+  },
+  "Previous": {
+    "Name": "Integration Tests",
+    "Path": "Tutorials/Part-4"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -562,8 +577,4 @@ private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
 }
 ````
 
-{{end}}
+{{end}}
-
-## The Next Part
-
-See the [next part](Part-6.md) of this tutorial.

docs/en/Tutorials/Part-6.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Authors: Database Integration",
+    "Path": "Tutorials/Part-7"
+  },
+  "Previous": {
+    "Name": "Authorization",
+    "Path": "Tutorials/Part-5"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -263,8 +278,4 @@ We will implement this repository in the next part.
 
 This part covered the domain layer of the authors functionality of the book store application. The main files created/updated in this part was highlighted in the picture below:
 
-![bookstore-author-domain-layer](images/bookstore-author-domain-layer.png)
+![bookstore-author-domain-layer](images/bookstore-author-domain-layer.png)
-
-## The Next Part
-
-See the [next part](Part-7.md) of this tutorial.

docs/en/Tutorials/Part-7.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Authors: Application Layer",
+    "Path": "Tutorials/Part-8"
+  },
+  "Previous": {
+    "Name": "Authors: Domain Layer",
+    "Path": "Tutorials/Part-6"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -226,8 +241,4 @@ public class MongoDbAuthorRepository
 
 > See the [MongoDB Integration document](../MongoDB.md) for more information on the MongoDB based repositories.
 
-{{end}}
+{{end}}
-
-## The Next Part
-
-See the [next part](Part-8.md) of this tutorial.

docs/en/Tutorials/Part-8.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Authors: User Interface",
+    "Path": "Tutorials/Part-9"
+  },
+  "Previous": {
+    "Name": "Authors: Database Integration",
+    "Path": "Tutorials/Part-7"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -589,7 +604,3 @@ public class MongoDBAuthorAppService_Tests : AuthorAppService_Tests<BookStoreMon
 {{end}}
 
 Created some tests for the application service methods, which should be clear to understand.
-
-## The Next Part
-
-See the [next part](Part-9.md) of this tutorial.

docs/en/Tutorials/Part-9.md

@@ -6,6 +6,21 @@
     "DB": ["EF","Mongo"]
 }
 ````
+
+````json
+//[doc-nav]
+{
+  "Next": {
+    "Name": "Book to Author Relation",
+    "Path": "Tutorials/Part-10"
+  },
+  "Previous": {
+    "Name": "Authors: Application Layer",
+    "Path": "Tutorials/Part-8"
+  }
+}
+````
+
 ## About This Tutorial
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
@@ -1242,8 +1257,4 @@ That's all! This is a fully working CRUD page, you can create, edit and delete t
 
 > **Tip**: If you run the `.DbMigrator` console application after defining a new permission, it automatically grants these new permissions to the admin role and you don't need to manually grant the permissions yourself.
 
-{{end}}
+{{end}}
-
-## The Next Part
-
-See the [next part](Part-10.md) of this tutorial.

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json

@@ -4,8 +4,7 @@
   "private": true,
   "dependencies": {
     "@abp/aspnetcore.mvc.ui.theme.shared": "~8.1.0-rc.1",
-    "@abp/prismjs": "^~7.3.2",
+    "@abp/prismjs": "~8.1.0-rc.1",
-    "@abp/highlight.js": "^~7.3.2"
+    "@abp/highlight.js": "~8.1.0-rc.1"
-  },
+  }
-  "devDependencies": {}
 }