Browse Source

Merge pull request #21000 from abpframework/auto-merge/rel-8-2/3050

Merge branch rel-8.3 with rel-8.2
pull/21001/head
maliming 2 years ago
committed by GitHub
parent
commit
c292ebc5e4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      docs/en/deployment/ssl.md
  2. 78
      docs/en/docs-nav.json
  3. 2
      docs/en/framework/ui/blazor/components/submit-button.md
  4. 2
      docs/en/modules/cms-kit-pro/index.md
  5. 2
      docs/en/solution-templates/application-module/index.md
  6. 4
      docs/en/solution-templates/layered-web-application/index.md
  7. 6
      docs/en/solution-templates/single-layer-web-application/index.md

2
docs/en/deployment/ssl.md

@ -1,4 +1,4 @@
# Configuring Configuring SSL certificate(HTTPS) # Configuring SSL certificate(HTTPS)
A website needs an SSL certificate in order to keep user data secure, verify ownership of the website, prevent attackers from creating a fake version of the site, and gain user trust. A website needs an SSL certificate in order to keep user data secure, verify ownership of the website, prevent attackers from creating a fake version of the site, and gain user trust.

78
docs/en/docs-nav.json

@ -1,41 +1,41 @@
{ {
"items": [ "items": [
{ {
"text": "Get started", "text": "Get Started",
"items": [ "items": [
{ {
"text": "Overview", "text": "Overview",
"path": "get-started" "path": "get-started"
}, },
{ {
"text": "Single-layer solution", "text": "Single Layer Web Application",
"path": "get-started/single-layer-web-application.md" "path": "get-started/single-layer-web-application.md"
}, },
{ {
"text": "Layered solution", "text": "Layered Web Application",
"path": "get-started/layered-web-application.md" "path": "get-started/layered-web-application.md"
}, },
{ {
"text": "Microservice solution", "text": "Microservice Solution",
"path": "get-started/microservice.md" "path": "get-started/microservice.md"
}, },
{ {
"text": "Others", "text": "Others",
"items": [ "items": [
{ {
"text": "Empty ASP.NET Core application", "text": "Empty ASP.NET Core MVC / Razor Pages Application",
"path": "get-started/empty-aspnet-core-application.md" "path": "get-started/empty-aspnet-core-application.md"
}, },
{ {
"text": "MAUI application", "text": "MAUI Application Startup Template",
"path": "get-started/maui.md" "path": "get-started/maui.md"
}, },
{ {
"text": "WPF application", "text": "WPF Application Startup Template",
"path": "get-started/wpf.md" "path": "get-started/wpf.md"
}, },
{ {
"text": "Console application", "text": "Console Application Startup Template",
"path": "get-started/console.md" "path": "get-started/console.md"
} }
] ]
@ -57,36 +57,36 @@
"path": "tutorials/todo" "path": "tutorials/todo"
}, },
{ {
"text": "Single-layer solution", "text": "Single-Layer Solution",
"path": "tutorials/todo/single-layer" "path": "tutorials/todo/single-layer"
}, },
{ {
"text": "Layered solution", "text": "Layered Solution",
"path": "tutorials/todo/layered" "path": "tutorials/todo/layered"
} }
] ]
}, },
{ {
"text": "Book Store Application", "text": "Web Application Development",
"items": [ "items": [
{ {
"text": "Overview", "text": "Overview",
"path": "tutorials/book-store" "path": "tutorials/book-store"
}, },
{ {
"text": "1: Creating the server side", "text": "1: Creating the Server Side",
"path": "tutorials/book-store/part-01.md" "path": "tutorials/book-store/part-01.md"
}, },
{ {
"text": "2: The Book List page", "text": "2: The Book List Page",
"path": "tutorials/book-store/part-02.md" "path": "tutorials/book-store/part-02.md"
}, },
{ {
"text": "3: Creating, updating and deleting books", "text": "3: Creating, Updating and Deleting Books",
"path": "tutorials/book-store/part-03.md" "path": "tutorials/book-store/part-03.md"
}, },
{ {
"text": "4: Integration tests", "text": "4: Integration Tests",
"path": "tutorials/book-store/part-04.md" "path": "tutorials/book-store/part-04.md"
}, },
{ {
@ -94,23 +94,23 @@
"path": "tutorials/book-store/part-05.md" "path": "tutorials/book-store/part-05.md"
}, },
{ {
"text": "6: Authors: Domain layer", "text": "6: Authors: Domain Layer",
"path": "tutorials/book-store/part-06.md" "path": "tutorials/book-store/part-06.md"
}, },
{ {
"text": "7: Authors: Database integration", "text": "7: Authors: Database Integration",
"path": "tutorials/book-store/part-07.md" "path": "tutorials/book-store/part-07.md"
}, },
{ {
"text": "8: Authors: Application layer", "text": "8: Authors: Application Layer",
"path": "tutorials/book-store/part-08.md" "path": "tutorials/book-store/part-08.md"
}, },
{ {
"text": "9: Authors: User interface", "text": "9: Authors: User Interface",
"path": "tutorials/book-store/part-09.md" "path": "tutorials/book-store/part-09.md"
}, },
{ {
"text": "10: Book to author relation", "text": "10: Book to Author Relation",
"path": "tutorials/book-store/part-10.md" "path": "tutorials/book-store/part-10.md"
} }
] ]
@ -123,35 +123,35 @@
"path": "tutorials/modular-crm/index.md" "path": "tutorials/modular-crm/index.md"
}, },
{ {
"text": "1: Creating the initial solution", "text": "1: Creating the Initial Solution",
"path": "tutorials/modular-crm/part-01.md" "path": "tutorials/modular-crm/part-01.md"
}, },
{ {
"text": "2: Creating the initial Products module", "text": "2: Creating the Initial Products Module",
"path": "tutorials/modular-crm/part-02.md" "path": "tutorials/modular-crm/part-02.md"
}, },
{ {
"text": "3: Building the Products module", "text": "3: Building the Products Module",
"path": "tutorials/modular-crm/part-03.md" "path": "tutorials/modular-crm/part-03.md"
}, },
{ {
"text": "4: Creating the initial Ordering module", "text": "4: Creating the Initial Ordering Module",
"path": "tutorials/modular-crm/part-04.md" "path": "tutorials/modular-crm/part-04.md"
}, },
{ {
"text": "5: Building the Ordering module", "text": "5: Building the Ordering Module",
"path": "tutorials/modular-crm/part-05.md" "path": "tutorials/modular-crm/part-05.md"
}, },
{ {
"text": "6: Integrating the modules: Implementing Integration Services", "text": "6: Integrating the Modules: Implementing Integration Services",
"path": "tutorials/modular-crm/part-06.md" "path": "tutorials/modular-crm/part-06.md"
}, },
{ {
"text": "7: Integrating the modules: Communication via Messages (Events)", "text": "7: Integrating the Modules: Communication via Messages (Events)",
"path": "tutorials/modular-crm/part-07.md" "path": "tutorials/modular-crm/part-07.md"
}, },
{ {
"text": "8: Integrating the modules: Joining the Products and Orders Data", "text": "8: Integrating the Modules: Joining the Products and Orders Data",
"path": "tutorials/modular-crm/part-08.md" "path": "tutorials/modular-crm/part-08.md"
} }
] ]
@ -177,7 +177,7 @@
"path": "cli" "path": "cli"
}, },
{ {
"text": "Examples for the new command", "text": "New Solution Sample Commands",
"path": "cli/new-command-samples.md" "path": "cli/new-command-samples.md"
} }
] ]
@ -256,7 +256,7 @@
"path": "suite/add-solution.md" "path": "suite/add-solution.md"
}, },
{ {
"text": "Creating new ABP solution", "text": "Creating New ABP Solution",
"path": "suite/create-solution.md" "path": "suite/create-solution.md"
}, },
{ {
@ -271,7 +271,7 @@
"path": "suite/creating-many-to-many-relationship.md" "path": "suite/creating-many-to-many-relationship.md"
}, },
{ {
"text": "Generating from an Existing Database", "text": "Generating From an Existing Database",
"path": "suite/generating-entities-from-an-existing-database-table.md" "path": "suite/generating-entities-from-an-existing-database-table.md"
}, },
{ {
@ -301,7 +301,7 @@
"path": "suite/editing-templates.md" "path": "suite/editing-templates.md"
}, },
{ {
"text": "How to uninstall", "text": "How to Uninstall",
"path": "suite/how-to-uninstall.md" "path": "suite/how-to-uninstall.md"
} }
] ]
@ -336,7 +336,7 @@
] ]
}, },
{ {
"text": "Caching", "text": "Distributed Caching",
"items": [ "items": [
{ {
"text": "Overview", "text": "Overview",
@ -653,7 +653,7 @@
"path": "framework/architecture" "path": "framework/architecture"
}, },
{ {
"text": "Best Practices", "text": "Module Development Best Practices & Conventions",
"items": [ "items": [
{ {
"text": "Overview", "text": "Overview",
@ -1184,7 +1184,7 @@
"text": "Other Components", "text": "Other Components",
"items": [ "items": [
{ {
"text": "SubmitButton", "text": "SubmitButton Component",
"path": "framework/ui/blazor/components/submit-button.md" "path": "framework/ui/blazor/components/submit-button.md"
} }
] ]
@ -1282,7 +1282,7 @@
"path": "framework/ui/angular/http-requests.md" "path": "framework/ui/angular/http-requests.md"
}, },
{ {
"text": "Customize Error Handling", "text": "Error Handling",
"path": "framework/ui/angular/http-error-handling.md" "path": "framework/ui/angular/http-error-handling.md"
} }
] ]
@ -1651,7 +1651,7 @@
"path": "solution-templates/microservice" "path": "solution-templates/microservice"
}, },
{ {
"text": "Application Module", "text": "Module Solution",
"path": "solution-templates/application-module" "path": "solution-templates/application-module"
} }
] ]
@ -1966,7 +1966,7 @@
"path": "others/why-abp-platform.md" "path": "others/why-abp-platform.md"
}, },
{ {
"text": "Free license vs Pro licenses?", "text": "Free (Open Source) License vs Commercial (Pro) Licenses",
"path": "others/free-licenses-vs-pro-licenses.md" "path": "others/free-licenses-vs-pro-licenses.md"
}, },
{ {
@ -1974,7 +1974,7 @@
"path": "others/penetration-test-report.md" "path": "others/penetration-test-report.md"
}, },
{ {
"text": "ASP.NET Zero vs ABP", "text": "ABP vs ASP.NET Zero",
"path": "others/aspnet-zero-vs-abp.md" "path": "others/aspnet-zero-vs-abp.md"
}, },
{ {

2
docs/en/framework/ui/blazor/components/submit-button.md

@ -1,4 +1,4 @@
# Blazor UI: SubmitButton component # Blazor UI: SubmitButton Component
`SubmitButton` is a simple wrapper around `Button` component. It is used to be placed inside of page Form or Modal dialogs where it can response to user actions and to be activated as a default button by pressing an ENTER key. Once clicked it will go into the `disabled` state and also it will show a small loading indicator until clicked event is finished. `SubmitButton` is a simple wrapper around `Button` component. It is used to be placed inside of page Form or Modal dialogs where it can response to user actions and to be activated as a default button by pressing an ENTER key. Once clicked it will go into the `disabled` state and also it will show a small loading indicator until clicked event is finished.

2
docs/en/modules/cms-kit-pro/index.md

@ -1,4 +1,4 @@
# CMS Kit Pro Module (Pro) # CMS Kit Module (Pro)
> You must have an ABP Team or a higher license to use this module. > You must have an ABP Team or a higher license to use this module.

2
docs/en/solution-templates/application-module/index.md

@ -1,4 +1,4 @@
# Module Startup Template # Module Solution Template
This template can be used to create a **reusable [application module](../../modules)** based on the [module development best practices & conventions](../../framework/architecture/best-practices). It is also suitable for creating **microservices** (with or without UI). This template can be used to create a **reusable [application module](../../modules)** based on the [module development best practices & conventions](../../framework/architecture/best-practices). It is also suitable for creating **microservices** (with or without UI).

4
docs/en/solution-templates/layered-web-application/index.md

@ -1,4 +1,4 @@
# Application Startup Template # Layered Application Solution Template
## Introduction ## Introduction
@ -6,7 +6,7 @@ This template provides a layered application structure based on the [Domain Driv
This document explains **the solution structure** and projects in details. If you want to start quickly, follow the guides below: This document explains **the solution structure** and projects in details. If you want to start quickly, follow the guides below:
* [The getting started document](../../get-started/single-layer-web-application.md) explains how to create a new application in a few minutes. * [The getting started document](../../get-started/layered-web-application.md) explains how to create a new application in a few minutes.
* [The application development tutorial](../../tutorials/book-store/part-01.md) explains step by step application development. * [The application development tutorial](../../tutorials/book-store/part-01.md) explains step by step application development.
## How to Start With? ## How to Start With?

6
docs/en/solution-templates/single-layer-web-application/index.md

@ -1,12 +1,12 @@
# Application (Single Layer) Startup Template # Single Layer Application Solution Template
## Introduction ## Introduction
This template provides a simple solution structure with a single project. This document explains that solution structure in details. This template provides a simple solution structure with a single project. This document explains that solution structure in details.
### The Difference Between the Application Startup Templates ### The Difference Between the Application Solution Templates
ABP's [Application Startup Template](../layered-web-application) provides a well-organized and layered solution to create maintainable business applications based on the [Domain Driven Design](../../framework/architecture/domain-driven-design) (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](../layered-web-application) but the development model is minimal and everything is in a single project (`.csproj`). ABP's [Layered Application Solution Template](../layered-web-application) provides a well-organized and layered solution to create maintainable business applications based on the [Domain Driven Design](../../framework/architecture/domain-driven-design) (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 [Layered Application Solution Template](../layered-web-application) but the development model is minimal and everything is in a single project (`.csproj`).
## How to Start with It? ## How to Start with It?

Loading…
Cancel
Save