Skip to content

Commit a2fc198

Browse files
committed
Merge branch 'master' into dev
2 parents 25b75ab + 3adc877 commit a2fc198

18 files changed

+202
-277
lines changed

docs/en/Abp-Template-vs-AspNet-Zero.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
<head>
55
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
6-
<link type="text/css" rel="stylesheet" href="bootstrap.min.css" />
7-
<title>ASP.NET Zero vs Free Template</title>
86
</head>
97

108
<body>

docs/en/Developing-Step-By-Step-Angular-Conclusion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ See [documentation](https://aspnetzero.com/Documents/Development-Guide-Rad-Tool)
2020

2121
### Source Code
2222

23-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
23+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
2424
code**. After purchasing, you can get the sample project from private
2525
Github repository: <https://github.com/aspnetzero/aspnet-zero-samples>
2626

docs/en/Developing-Step-By-Step-Angular-Running-Conclusion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ See [documentation](https://aspnetzero.com/Documents/Development-Guide-Rad-Tool)
2020

2121
### Source Code
2222

23-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
23+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
2424
code**. After purchasing, you can get the sample project from private
2525
Github repository: <https://github.com/aspnetzero/aspnet-zero-samples>

docs/en/Developing-Step-By-Step-Core-Conclusion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ See [documentation](https://aspnetzero.com/Documents/Development-Guide-Rad-Tool)
1616

1717
### Source Code
1818

19-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
19+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
2020
code**. After purchasing, you can get the sample project from private
2121
Github repository: <https://github.com/aspnetzero/aspnet-zero-samples>

docs/en/Developing-Step-By-Step-MPA.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2014,6 +2014,6 @@ but does not restrict you. You can make your own style development.
20142014

20152015
### Source Code
20162016

2017-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
2017+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
20182018
code**. After purchasing, you can get the sample project from private
20192019
Github repository: <https://github.com/aspnetzero/aspnet-zero-samples>

docs/en/Developing-Step-By-Step-Mvc-Angularjs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1695,6 +1695,6 @@ application.
16951695

16961696
### Source Code
16971697

1698-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
1698+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
16991699
code**. After purchasing, you can get the sample project from private
17001700
Github repository: <https://github.com/aspnetzero/aspnet-zero-samples>

docs/en/Developing-Step-By-Step-Xamarin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,6 @@ In this document, we built a complete example that covers most parts of the ASP.
13971397

13981398
### Source Code
13991399

1400-
You should [purchase](/Prices) ASP.NET Zero in order to get **source
1400+
You should [purchase](https://aspnetzero.com/Pricing) ASP.NET Zero in order to get **source
14011401
code**. After purchasing, you can get the sample project from private
14021402
GitHub repository: <https://github.com/aspnetzero/aspnet-zero-samples>

docs/en/Development-Guide-Xamarin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ required for iOS development.
6060

6161
### Solution Structure (Layers)
6262

63-
After you [download](/Download) your project, you will see 3 types of
63+
After you [download](https://aspnetzero.com/Download) your project, you will see 3 types of
6464
solutions;
6565

6666
- **.Mobile** Xamarin and related projects included.

docs/en/Features-Mvc-Core-Login.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Login
22

3+
## Account Controller
4+
5+
**AccountController** provides **login**, **register**, **forgot password** and **email activation** pages.
6+
7+
## Layout
8+
9+
Account management pages have a separated **\_Layout** view under **Views/Account** folder:
10+
11+
<img src="images/account-views-core-v2.png" alt="Account Views" class="img-thumbnail" width="216" height="214" />
12+
13+
Related **Script** and **Style** resources located under **view-resources/Views/Account** folder:
14+
15+
<img src="images/account-views-core-resources.png" alt="Account view resources" class="img-thumbnail" width="205" height="347" />
16+
17+
As similar, all views of the application have corresponding style and script files under **wwwroot/view-resources** folder.
18+
19+
## Login Page
20+
321
Main view for `AccountController` is the Login page:
422

523
<img src="images/login-screen-3.png" alt="Login page" class="img-thumbnail" />
@@ -12,9 +30,9 @@ We can use **admin** user name and **123qwe** password in first run the applicat
1230

1331
After changing password we are redirected to the **backend application**.
1432

15-
## User Lockout
33+
### User Lockout
1634

17-
As seen in the previous section, you can configure user lockout settings. Users are lockout when they enter wrong password for a specified count and duration.
35+
Users are lockout when they enter wrong password for a specified count and duration. You can configure lockout settings in the settings page of the application.
1836

1937
## Next
2038

docs/en/Getting-Started-Angular.md

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
11
# Getting Started
22

3-
This document is aimed to create and run an ASP.NET Zero based project in just 10 minutes. It's assumed that you already [purchased](https://aspnetzero.com/Prices) and created your ASP.NET Zero account.
4-
5-
## Login
6-
7-
[Login](https://aspnetzero.com/Account/Login) to this web site with your user name and password. Then you will see [Download](https://aspnetzero.com/Download) link on the main menu.
3+
This document is aimed to create and run an ASP.NET Zero based project in just 5 minutes. It's assumed that you already [purchased](https://aspnetzero.com/Pricing) and created your ASP.NET Zero account.
84

95
## Create Your Project
106

11-
Go to the [download](https://aspnetzero.com/Download) page. You will see a form as shown below:
7+
[Login to aspnetzero.com](https://aspnetzero.com/Account/Login) with your user name and password. Go to the [download](https://aspnetzero.com/Download) page. You will see a form as shown below:
128

139
<img src="images/download-angular-3.png" alt="Download angular" class="img-thumbnail" />
1410

1511
Select **ASP.NET Core & Angular** as Project Type and fill other required fields. Your project will be ready in one minute. When you open the downloaded zip file, you will see two folders:
1612

1713
<img src="images/angular-solution-folders.png" alt="Client Server folders" class="img-thumbnail" />
1814

19-
- **angular** folder contains the [Angular application](Features-Angular) which is configured to work with [angular-cli](https://cli.angular.io/).
20-
- **aspnet-core** folder contains the [server side](Features-Mvc-Core) ASP.NET Core solution and configured to work with [Visual Studio](https://www.visualstudio.com/vs/community/).
15+
- **angular** folder contains the Angular UI application which is configured to work with the [angular-cli](https://cli.angular.io/).
16+
- **aspnet-core** folder contains the server side ASP.NET Core solution and configured to work with [Visual Studio](https://www.visualstudio.com/vs/community/).
2117

2218
### Merging Client and Server Solutions
2319

24-
Client and Server solutions are designed to work separately by default but if you want to work on a single Visual Studio solution, you can select "One Solution" checkbox while downloading your project.
20+
Client and Server solutions are designed to work separately by default. If you want to work on a single Visual Studio solution, you can select "Single Solution" checkbox while downloading your project.
2521

26-
## ASP.NET Core Application
22+
## Pre Requirements
2723

28-
When you open the server side solution **\*.Web.sln** in **Visual Studio 2017+**, you will see the solution structure as below:
24+
- [Visual Studio 2017 (v15.9.0+)](https://www.visualstudio.com) (for backend ASP.NET Core application)
25+
- [Typescript 2.0+](https://www.microsoft.com/en-us/download/details.aspx?id=48593)
26+
- [Node.js 6.9+ with NPM 3.10+](https://nodejs.org/en/download/)
27+
- [Gulp](https://www.npmjs.com/package/gulp) (*must be installed globally*)
28+
- [Yarn](https://yarnpkg.com/)
2929

30-
If you want to work on only Xamarin project, open **\*.Mobile.sln** solution. If you want to work on both Xamarin and Web projects, open **\*.All.sln** solution.
30+
## ASP.NET Core Application
31+
32+
When you open the server side solution (**\*.Web.sln**) in **Visual Studio 2017+**, you will see the solution structure as below:
3133

3234
<img src="images/aspnet-core-host-solution-4.png" alt="ASP.NET Core solution structure" class="img-thumbnail" />
3335

34-
Right click the **.Web.Host** project and select "**Set as StartUp project**": Then **build** the solution. It may take a longer time during the first build since all **nuget** packages will be restored.
36+
> If you want to work on only Xamarin project, open **\*.Mobile.sln** solution. If you want to work on both of Xamarin and Web projects, open **\*.All.sln** solution.
37+
38+
Right click the **.Web.Host** project and select "**Set as StartUp project**". Then **build** the solution. It may take a longer time during the first build since all **nuget** packages will be restored.
3539

3640
### Database
3741

@@ -51,11 +55,11 @@ We have two options to create and migrate database to the latest version.
5155

5256
##### ASP.NET Zero Migrator Application
5357

54-
ASP.NET Zero solution includes a **.Migrator** (like Acme.PhoneBookDemo.Migrator) project in the solution. You can run this tool for database migrations on development and production (see [development guide](Features-Angular) for more information).
58+
ASP.NET Zero solution includes a **.Migrator** (like Acme.PhoneBookDemo.Migrator) project in the server side solution. You can run this tool for database migrations on development and production (see [migrator docs](Migrator-Console-Application) for more information).
5559

5660
##### Entity Framework Migration Command
5761

58-
You can also use Entity Framework's built-in tools for migrations. Open **Package Manager Console** in Visual Studio, set *.**EntityFrameworkCore** as the **Default Project** and run the **Update-Database** command as shown below: 
62+
You can also use Entity Framework Core's built-in tools for migrations. Open **Package Manager Console** in Visual Studio, set *.**EntityFrameworkCore** as the **Default Project** and run the **Update-Database** command as shown below: 
5963

6064
<img src="images/update-database-ef-core.png" alt="dotnet ef database update" class="img-thumbnail" />
6165

@@ -65,20 +69,19 @@ This command will create your database and fill initial data. You can open SQL S
6569

6670
You can use EF console commands for development and Migrator.exe for production. But notice that; Migrator.exe supports running migrations in multiple databases at once, which can be useful in development/production for multi tenant applications.
6771

68-
### Multi-Tenancy
72+
### Configure Multi-Tenancy
6973

70-
ASP.NET Zero supports multi-tenant and single-tenant applications. Multi-tenancy is **enabled by default**. If you don't have an idea about multi-tenancy, you can read it on [wikipedia.org/wiki/Multitenancy](https://en.wikipedia.org/wiki/Multitenancy). If you don't want to create a multi-tenant application, you can **disable** it by setting **PhoneBookDemoConsts.MultiTenancyEnabled** to false in the ***.Core.Shared** project.
74+
ASP.NET Zero supports multi-tenant and single-tenant applications. Multi-tenancy is **enabled by default**. If you don't have an idea about multi-tenancy, you can read it on [wikipedia.org/wiki/Multitenancy](https://en.wikipedia.org/wiki/Multitenancy). If you don't want to create a multi-tenant application, you can **disable** it by setting **PhoneBookDemoConsts.MultiTenancyEnabled** to false in the ***.Core.Shared** project (name of the PhoneBookDemoConsts will be like *YourProjectName*Consts for your project).
7175

7276
### Run API Host
7377

74-
Once you've done the configuration, you can run the application. Server
75-
side application only contains APIs. When you start the application you will see a login page:
76-
77-
**NOTE:** If your project is a merged project, you will not see the login page when you start the host project. Basically you need to manually navigate to http://localhost:22742/ui/login.
78+
Once you've done the configuration, you can run the application. Server side application only contains APIs. When you start the application you will see a login page:
7879

7980
<img src="images/host-login-page.png" alt="Swagger UI" class="img-thumbnail" />
8081

81-
If you log in to host application, then you will see host main page:
82+
**NOTE:** If your project is a merged project, you will not see the login page when you start the host project. Basically you need to manually navigate to http://localhost:22742/ui/login.
83+
84+
If you log in to host application, then you will see a page like that:
8285

8386
<img src="images/host-home-page.png" alt="Swagger UI" class="img-thumbnail" />
8487

@@ -88,23 +91,15 @@ You can navigate **Swagger UI**, **Hangfire Dashboard** or **GraphQL Playground*
8891

8992
## Angular Application
9093

91-
### Prerequirements
92-
93-
Angular application needs the following tools to be installed:
94-
95-
- [nodejs](https://nodejs.org/en/download/) 6.9+ with npm 3.10+
96-
- [Typescript 2.0+](https://www.typescriptlang.org/)
97-
- [yarn](https://yarnpkg.com/)
98-
9994
### Restore Packages
10095

101-
Navigate to the Angular folder, open a command line and run the following command to restore packages:
96+
Navigate to the **angular folder**, open a command line and run the following command to restore the packages:
10297

10398
yarn
10499

105-
**Note:** If you downloaded merged project then you should run commands on `Host` folder not `Angular` folder.
100+
**Note:** If you've downloaded a merged project then you should run commands on `Host` folder (the folder contaning the *.Web.Host project).
106101

107-
We suggest to use [yarn](https://yarnpkg.com/) because NPM has some problems. It is slow and can not consistently resolve dependencies, yarn solves those problems and it is compatible to NPM as well.
102+
We use [yarn](https://yarnpkg.com/) because NPM has some problems; It is slow and can not consistently resolve dependencies. Yarn solves those problems and it is compatible to NPM as well.
108103

109104
### Running The Application
110105

@@ -118,24 +113,26 @@ Once the application compiled, you can browse <http://localhost:4200> in your br
118113

119114
### Login
120115

121-
All ready.. just run your solution to enter to the login page:
116+
All ready! Just run your solution to enter to the login page:
122117

123118
<img src="images/login-screen-3.png" alt="Login page" class="img-thumbnail" />
124119

125-
If multi-tenancy is enabled, you will see the current tenant and a change link. If so, click to **Change** like and enter **default** as tenant name. If you leave it empty, you login as the host admin user. Then enter **admin** as user name and **123qwe** as password. You should change your password at first login.
120+
If multi-tenancy is enabled, you will see the current tenant and a change link. If so, click to **Change** and enter **default** as tenant name. If you leave it empty, you login as the host admin user. Then enter **admin** as user name and **123qwe** as password (remember to change it to a more secure password on production!).
126121

127122
### Application UI
128123

129-
After you login to the application, you will see the sample dashboard screen:
124+
After login to the application, you will see the sample dashboard screen:
130125

131126
<img src="images/dashboardV3.png" alt="Dashboard" class="img-thumbnail" width="1235" height="965" />
132127

133128
## ASP.NET Zero Power Tools
134129

135-
ASP.NET Zero Power Tools lets you to create a new page from the backend to the UI layer by just typing your entity properties. It creates the entity, related permissions, application services, client-side code, applies DB migrations and adds to the main menu. Finally you will have a CRUD page that is capable of insert, update, delete, list, excel export functions. To minimize the effort of creating a new page, install the Power Tools from the following link:
130+
ASP.NET Zero Power Tools lets you to create a new page from the database to the UI layer by just typing your entity properties. It creates the entity, related permissions, application services, DTOs, client-side code, a menu element and so on... It also creates & applies database migrations.
131+
132+
Finally you will have a CRUD page with insert, update, delete, list and excel export functions. To minimize the effort of creating a new page, install the Power Tools from the following link:
136133

137134
[https://marketplace.visualstudio.com/items?itemName=Volosoft.AspNetZeroPowerTools](https://marketplace.visualstudio.com/items?itemName=Volosoft.AspNetZeroPowerTools)
138135

139136
## Next
140137

141-
Your solution is up and working. See the [Xamarin Development Guide](Development-Guide-Xamarin) or [Angular Overview](Overview-Angular) document for more information.
138+
* [Solution Overview](Overview-Angular.md)

0 commit comments

Comments
 (0)