Merge branch 'rel-5.3' into dev

docs/en/CLI.md

@@ -109,7 +109,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample
   * **`module`**: [Module template](Startup-Templates/Module.md). Additional options:
     * `--no-ui`: Specifies to not include the UI. This makes possible to create service-only modules (a.k.a. microservices - without UI).
   * **`console`**: [Console template](Startup-Templates/Console.md).
-  * **`app-nolayers`**: Application single layer template.
+  * **`app-nolayers`**: [Single-layer application template](Startup-Templates/Application-Single-Layer.md). Additional options:
     * `--ui` or `-u`: Specifies the UI framework. Default framework is `mvc`. Available frameworks:
       * `mvc`: ASP.NET Core MVC.
       * `angular`: Angular UI.

docs/en/Index.md

@@ -4,7 +4,7 @@ ABP Framework offers an **opinionated architecture** to build enterprise softwar
 
 ## Getting Started
 
-* [Quick Start](Tutorials/Todo/Index.md) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to quickly understand how ABP works.
+* [Quick Start](Tutorials/Todo/Overall.md) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to quickly understand how ABP works.
 * [Getting Started](Getting-Started.md) guide can be used to create and run ABP based solutions with different options and details.
 * [Web Application Development Tutorial](Tutorials/Part-1.md) is a complete tutorial to develop a full stack web application with all aspects of a real-life solution.
 

docs/en/Startup-Templates/Application-Single-Layer.md

@@ -2,19 +2,15 @@
 
 ## Introduction
 
-This template provides a single-layered application for a quick start with ABP Framework. 
+This template provides a simple solution structure with a single project. This document explains that solution structure in details.
 
-This document explains the **solution structure** and project in detail.
+### The Difference Between the Application Startup Templates
 
-### What is the Difference Between the Application Startup Templates?
-
-ABP's [Application Startup Template](Application.md) provides a well-organized and layered solution to create maintainable business applications based on the [Domain Driven Design](../Domain-Driven-Design.md) (DDD) practices. However, some developers find this template a little bit complex (or unnecessary) for simple and short-time applications.
-
-At this point, a single-layer application template has been created for such applications. This template has the same functionality, features and modules on runtime with the [Application Startup Template](Application.md) but the development model is minimal and everything is in a single project (`.csproj`).
+ABP's [Application Startup Template](Application.md) provides a well-organized and layered solution to create maintainable business applications based on the [Domain Driven Design](../Domain-Driven-Design.md) (DDD) practices. However, some developers find this template a little bit complex for simple and short-term applications. The single-layer application template has been created to provide a simpler development model for such applications. This template has the same functionality, features and modules on runtime with the [Application Startup Template](Application.md) but the development model is minimal and everything is in a single project (`.csproj`).
 
 ## How to Start with It?
 
-You can use the [ABP CLI](../CLI.md) to create a new project using this startup template. Alternatively, you can directly create & download this startup template from the [Get Started](https://abp.io/get-started) page. How to download via CLI is explained in this section.
+You can use the [ABP CLI](../CLI.md) to create a new project using this startup template. Alternatively, you can directly create & download this startup template from the [Get Started](https://abp.io/get-started) page. In this section, we will use the ABP CLI.
 
 Firstly, install the ABP CLI if you haven't installed it before:
 
@@ -29,26 +25,26 @@ abp new Acme.BookStore -t app-nolayers
 ```
 
 * `Acme.BookStore` is the solution name, like *YourCompany.YourProduct*. You can use single-level, two-level or three-level naming.
-* In this example, the `-t` option (or `--template` option) specifies the template name.
- 
+* In this example, the `-t` (or `--template`) option specifies the template name.
+
 ### Specify the UI Framework
 
 This template provides multiple UI frameworks:
 
 * `mvc`: ASP.NET Core MVC UI with Razor Pages (default)
 * `blazor-server`: Blazor Server UI
 * `angular`: Angular UI
-* `none`: Without UI
+* `none`: Without UI (for HTTP API development)
 
-> Currently, this template doesn't have Blazor WASM UI, because it requires 3 projects at least (server-side, UI and shared library between these two projects). 
+> This template doesn't have Blazor WebAssembly UI, because it requires 3 projects at least (server-side, UI and shared library between these two projects). We are recommending to use the layered [application startup template](Application.md) for Blazor WebAssembly projects.
 
-Use the `-u` or `--ui` option to specify the UI framework while creating the solution:
+Use the `-u` (or `--ui`) option to specify the UI framework while creating the solution:
 
 ```bash
 abp new Acme.BookStore -t app-nolayers -u angular
 ```
 
-* This example specifies the UI type (`-u` option) as `angular`, you can also specify `mvc` or `blazor-server` for UI type.
+This example specifies the UI type (the `-u` option) as `angular`. You can also specify `mvc`, `blazor-server` or `none` for the UI type.
 
 ### Specify the Database Provider
 
@@ -69,37 +65,42 @@ If you don't specify any additional options while creating an `app-nolayers` tem
 
 ![](../images/bookstore-single-layer-solution-structure.png)
 
-It's a single-layer template rather than a layered-architecture solution (like the `Application Startup Template`). It's helpful to create a running application quickly without considering the layered architecture.
+In the next sections, we will explain the structure based on this example. Your startup solution can be slightly different based on your preferences.
 
 ### Folder Structure
 
-Since this template provides a single-layer solution, we've separated concerns into folders instead of layers and you can see the pre-defined folders as shown below:
+Since this template provides a single-project solution, we've separated concerns into folders instead of projects. You can see the pre-defined folders as shown below:
 
 ![](../images/single-layer-folder-structure.png)
 
-* You can define your `entities`, `application services`, `DTOs`, etc. in this single project (in the related folders). 
-* For example, you can define your `application services` and `DTOs` under the **Services** folder.
+* Define your database mappings (for [EF Core](../Entity-Framework-Core.md) or [MongoDB](../MongoDB.md)) and [repositories](../Repositories.md) in the `Data` folder.
+* Define your [entities](../Entities.md) in the `Entities` folder.
+* Define your UI localization keys/values in the `Localization` folder.
+* Define your UI menu items in the `Menus` folder.
+* Define your [object-to-object mapping](../Object-To-Object-Mapping.md) classes in the `ObjectMapping` folder.
+* Define your UI pages (Razor Pages) in the `Pages` folder (create `Controllers` and `Views` folder yourself if you prefer the MVC pattern).
+* Define your [application services](../Application-Services.md) in the `Services` folder. 
 
 ### How to Run?
 
-Before running the application, you need to create the database and seed the initial data. To do that, you can run the following command in the directory of your project:
+Before running the application, you need to create the database and seed the initial data. To do that, you can run the following command in the directory of your project (in the same folder of the `.csproj` file):
 
 ```bash
 dotnet run --migrate-database
 ```
 
-* This command will create the database and seed the initial data for you. Then you can run the application with any IDE that supports .NET or by running the `dotnet run` CLI command in the directory of your project. The default username is `admin` and the password is `1q2w3E*`.
+This command will create the database and seed the initial data for you. Then you can run the application with any IDE that supports .NET or by running the `dotnet run` command in the directory of your project. The default username is `admin` and the password is `1q2w3E*`.
 
-> While creating a database & applying migrations seem only necessary for relational databases, this project comes even if you choose a NoSQL database provider (like MongoDB). In that case, it still seeds the initial data which is necessary for the application.
+> While creating a database & applying migrations seem only necessary for relational databases, you should run this command even if you choose a NoSQL database provider (like MongoDB). In that case, it still seeds the initial data which is necessary for the application.
 
-### Angular UI 
+### The Angular UI 
 
 If you choose `Angular` as the UI framework, the solution will be separated into two folders:
 
 * An `angular` folder that contains the Angular UI application, the client-side code.
 * An `aspnet-core` folder that contains the ASP.NET Core solution (a single project), the server-side code.
 
-The server-side is similar to the solution described in the [Solution Structure](#solution-structure) section above. This project serves the API, so the `Angular` application can consume it.
+The server-side is similar to the solution described in the *Solution Structure* section above. This project serves the API, so the Angular application can consume it.
 
 The client-side application consumes the HTTP APIs as mentioned. You can see the folder structure of the Angular project shown below:
 

docs/en/Tutorials/Todo/Index.md

@@ -17,19 +17,14 @@ You can find the source code of the completed application [here](https://github.
 ## Pre-Requirements
 
 * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) development.
+* [Node v14.x](https://nodejs.org/)
 
 {{if DB=="Mongo"}}
 
 * [MongoDB Server 4.0+](https://docs.mongodb.com/manual/administration/install-community/)
 
 {{end}}
 
-{{if UI=="NG"}}
-
-* [Node v14.x](https://nodejs.org/)
-
-{{end}}
-
 ## Creating a New Solution
 
 We will use the [ABP CLI](../../CLI.md) to create new solutions with the ABP Framework. You can run the following command in a command-line terminal to install it:

docs/en/Tutorials/Todo/Overall.md

@@ -0,0 +1,14 @@
+# Quick Start: Overall
+
+**Welcome to the ABP Framework**. This is a single-part, quick-start tutorial to build a simple application. Start with this tutorial if you want to quickly understand how ABP Framework works.
+
+## Select the Solution Architecture
+
+This tutorial has multiple versions. Please select the one best fits for you:
+
+* **[Single-Layer Solution](Single-Layer/Index.md)**: Creates a single-project solution. Recommended for building an application with a **simpler and easy to understand** architecture.
+* **[Layered Solution Architecture](Index.md)**: A fully layered (multiple projects) solution based on [Domain Driven Design](../../Domain-Driven-Design.md) practices. Recommended for long-term projects that need a **maintainable and extensible** codebase.
+
+## See Also
+
+* Check the [Web Application Development Tutorial](../Part-1.md) to see a real-life web application development in a layered architecture.