Skip to content

Commit 420540c

Browse files
committed
Merge branch 'v5.0' of https://github.com/aspnetzero/documents into v5.0
2 parents cb3694d + 9c95d9c commit 420540c

File tree

111 files changed

+646
-555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+646
-555
lines changed

README.md

Lines changed: 1 addition & 1 deletion

doc/Developing-Step-By-Step-Angular.html

Lines changed: 281 additions & 307 deletions
Large diffs are not rendered by default.

doc/Developing-Step-By-Step-Core.html

Lines changed: 96 additions & 94 deletions
Large diffs are not rendered by default.

doc/Development-Guide-Angular.html

Lines changed: 100 additions & 54 deletions
Large diffs are not rendered by default.

doc/Development-Guide-Core.html

Lines changed: 139 additions & 78 deletions
Large diffs are not rendered by default.

doc/Getting-Started-Angular.html

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h3 id="DocCreateProject">Create a Project</h3>
2222
<p>Go to the <a href="/Download">download</a> page. You will see a form as shown
2323
below:</p>
2424
<p>
25-
<img class="img-thumbnail" alt="Download angular" src="images/download-angular-2.png" /></p>
25+
<img class="img-thumbnail" alt="Download angular" src="images/download-angular-3.png" /></p>
2626
<p>Select <strong>ASP.NET Core &amp; Angular</strong> as Project Type and fill
2727
other required fields. Your project will be ready
2828
in one minute. When you open the downloaded zip file, you will see two folders:</p>
@@ -42,10 +42,16 @@ <h4>Merging Client and Server Solutions</h4>
4242
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.
4343
</p>
4444
<h3>ASP.NET Core Application</h3>
45-
<p>When you open Server side solution in <strong>Visual Studio 2017+</strong>, you will see the
45+
<p>When you open Server side solution
46+
<strong>*.Web.sln</strong> in <strong>Visual Studio 2017+</strong>, you will see the
4647
solution structure as like below:</p>
48+
<div class="alert alert-warning">
49+
<p>If you want to work on only Xamarin project, open <strong>*.Mobile.sln</strong> solution. If you want to work on both Xamarin and Web projects, open
50+
<strong>*.All.sln</strong> solution.</p>
51+
</div>
52+
4753
<p>
48-
<img class="img-thumbnail" alt="AspNet Core solution structure" src="images/aspnet-core-host-solution-3.png" /></p>
54+
<img class="img-thumbnail" alt="ASP.NET Core solution structure" src="images/aspnet-core-host-solution-4.png" /></p>
4955
<p>
5056
Right click the
5157
<strong>.Web.Host</strong> project and select "<strong>Set as StartUp project</strong>": Then <strong>
@@ -55,14 +61,14 @@ <h4 id="DocConfigureDbConn">Database Connection</h4>
5561

5662
<p>Open <strong>appsettings.json</strong> in <strong>.Web.Host</strong> project and change the <strong>Default</strong> connection string if you want:</p>
5763
<pre lang="js">"ConnectionStrings": {
58-
"Default": "Server=localhost; Database=<strong>PhoneBookDb</strong>; Trusted_Connection=True;"
64+
"Default": "Server=localhost; Database=<strong>PhoneBookDemoDb</strong>; Trusted_Connection=True;"
5965
}</pre>
6066

6167
<h4 id="DocConfigureMigrations">Database Migrations</h4>
6268
<p>We have two options to create and migrate database to the latest version.</p>
6369
<h5>AspNet Zero Migrator Application</h5>
6470
<p>AspNet Zero solution includes a <strong>.Migrator</strong> (like
65-
Acme.PhoneBook.Migrator) project in the solution. You can run
71+
Acme.PhoneBookDemo.Migrator) project in the solution. You can run
6672
this tool for database migrations on development and production (see
6773
<a href="Development-Guide-Angular.html">development guide</a> for more information).</p>
6874

@@ -90,15 +96,15 @@ <h4 id="DocConfigureMultiTenancy">Multi-Tenancy</h4>
9096
Multi-tenancy is <strong>enabled by default</strong>. If you don't have idea
9197
about multi-tenancy or don't want to create a multi-tenant application, you can
9298
<strong>disable</strong> it by setting <strong>
93-
AbpZeroTemplateConsts.MultiTenancyEnabled</strong> to false in the .Core
99+
AbpZeroTemplateConsts.MultiTenancyEnabled</strong> to false in the .Core.Shared
94100
project.</p>
95101
<h4>Run API Host</h4>
96102

97103
<p>Once you've done the configuration, you can run the application. Server side
98104
application only contains APIs. So, default page is a swagger UI which can be
99105
used to investigate the API:</p>
100106
<p>
101-
<img class="img-thumbnail" alt="Swagger UI" height="837" src="images/swagger-ui-ng2.png" width="973" /></p>
107+
<img class="img-thumbnail" alt="Swagger UI" src="images/swagger-ui-ng2-1.png" /></p>
102108
<h3>Angular Application</h3>
103109
<h4>Prerequirements</h4>
104110
<p>Angular application needs to following tools be installed:</p>
@@ -131,7 +137,7 @@ <h4 id="DocRunProject">Login</h4>
131137

132138
<p>All ready.. just run your solution to enter to the login page:</p>
133139
<p>
134-
<img class="img-thumbnail" alt="Login page" height="511" src="images/login-screen-2.png" width="424" /></p>
140+
<img class="img-thumbnail" alt="Login page" src="images/login-screen-3.png" /></p>
135141
<p>If multi-tenancy is enabled, you will see the current tenant and a change
136142
link. If so, click to <strong>Change</strong> like and enter <strong>default</strong> as tenant name.
137143
If you leave it empty, you login as the host admin user. Then enter
@@ -141,12 +147,12 @@ <h4>Application UI</h4>
141147
<p>After login to the application, you will
142148
see the sample dashboard screen:</p>
143149
<p>
144-
<img class="img-thumbnail" alt="Dashboard" height="965" src="images/dashboardV2.png" width="1235" /></p>
150+
<img class="img-thumbnail" alt="Dashboard" height="965" src="images/dashboardV3.png" width="1235" /></p>
145151
<h3 id="DocMore">More</h3>
146152

147153
<p>Your solution is up and working.
148154
See
149-
<a href="Development-Guide-Angular.html"><span class="text-primary">development guide</span></a> document for more
155+
<a href="Getting-Started-Xamarin.html"><span class="text-primary">getting started</span></a> for Xamarin application, <a href="Development-Guide-Angular.html"><span class="text-primary">development guide</span></a> document for more
150156
information.</p>
151157

152158
<script src="libs/jquery/jquery-3.1.0.min.js" type="text/javascript"></script>

doc/Getting-Started-Core.html

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ <h3 id="DocCreateProject">Create a Project</h3>
2525
<img class="img-thumbnail" alt="Create project" src="images/download-core-jquery-2.png" /></p>
2626
<p>Select <strong>ASP.NET Core &amp; jQuery</strong> as Project Type and fill
2727
other required fields. Click to the Download button, your project will be ready
28-
in one minute. Open the solution in <strong>Visual Studio 2017+</strong>:</p>
29-
28+
in one minute. Open the <strong>*.Web.sln</strong> solution in <strong>Visual Studio 2017+</strong>:</p>
29+
<div class="alert alert-warning">
30+
<p>If you want to work on only Xamarin project, open <strong>*.Mobile.sln</strong> solution. If you want to work on both Xamarin and Web projects, open
31+
<strong>*.All.sln</strong> solution.</p>
32+
</div>
3033
<p>
3134
<img class="img-thumbnail" alt="ASP.NET Core solution" src="images/solution-overall-core-5.png" /></p>
3235
<p>
@@ -40,34 +43,33 @@ <h3 id="DocConfigureProject">Configure The Project</h3>
4043

4144
<div class="alert alert-warning">
4245
<strong>Important Notice:</strong><br>
43-
<p>Installing client side npm dependencies using <strong>yarn</strong> before opening the solution will increase project opening &amp; building time dramatically.</p>
46+
<p>Installing client side npm dependencies using <strong>yarn</strong> before opening the solution will decrease project opening &amp; building time dramatically.</p>
4447
</div>
4548

4649
<p>Before opening the solution open a command prompt, navigate to root directory of <strong>*.Web.Mvc</strong> project and run "<strong>yarn</strong>" command to install client side dependencies.</p>
4750

4851
<h3 id="DocPrerequirements">Prerequirements</h3>
4952

50-
<p>MVC application needs to following tools be installed:</p>
53+
<p>MVC application needs the following tools to be installed:</p>
5154

5255
<ul>
53-
<li><a href="https://nodejs.org/en/download/" target="_blank">nodejs</a>
54-
6.9+ with npm 3.10+</li>
55-
<li><a href="https://www.npmjs.com/package/gulp">gulp (must be installed globally)</a></li>
56-
<li><a href="https://yarnpkg.com/">yarn</a></li>
56+
<li><a href="https://nodejs.org/en/download/" target="_blank">nodejs</a> 6.9+ with npm 3.10+</li>
57+
<li><a href="https://www.npmjs.com/package/gulp" target="_blank">gulp (must be installed globally)</a></li>
58+
<li><a href="https://yarnpkg.com/" target="_blank">yarn</a></li>
5759
</ul>
5860

5961
<h4 id="DocConfigureDbConn">Database Connection</h4>
6062

6163
<p>Open <strong>appsettings.json</strong> in <strong>.Web.Mvc</strong> project and change the <strong>Default</strong> connection string if you want:</p>
6264
<pre lang="js">"ConnectionStrings": {
63-
"Default": "Server=localhost; Database=<strong>PhoneBookDb</strong>; Trusted_Connection=True;"
65+
"Default": "Server=localhost; Database=<strong>PhoneBookDemoDb</strong>; Trusted_Connection=True;"
6466
}</pre>
6567

6668
<h4 id="DocConfigureMigrations">Database Migrations</h4>
6769
<p>We have two options to create and migrate database to the latest version.</p>
6870
<h5>AspNet Zero Migrator Application</h5>
6971
<p>AspNet Zero solution includes a <strong>.Migrator</strong> (like
70-
Acme.PhoneBook.Migrator) project in the solution. You can run
72+
Acme.PhoneBookDemo.Migrator) project in the solution. You can run
7173
this tool for database migrations on development and production (see
7274
<a href="Development-Guide-Core.html">development guide</a> for more information).</p>
7375

@@ -118,7 +120,7 @@ <h3 id="DocMore">More</h3>
118120

119121
<p>Your solution is up and working.
120122
See
121-
<a href="Development-Guide-Core.html"><span class="text-primary">development guide</span></a> document for more
123+
<a href="Getting-Started-Xamarin.html"><span class="text-primary">getting started</span></a> for Xamarin application, <a href="Development-Guide-Core.html"><span class="text-primary">development guide</span></a> document for more
122124
information.</p>
123125

124126
<script src="libs/jquery/jquery-3.1.0.min.js" type="text/javascript"></script>
12.6 KB

doc/images/app-layout-core-1.png

7.05 KB
12.9 KB

doc/images/audit-logs-core-3.png

124 KB

doc/images/audit-logs-detail-1.png

61.7 KB
56.8 KB

doc/images/chat-attachments-core.png

12.4 KB

doc/images/chat-conversation-1.png

103 KB

doc/images/chat-features-1.png

28.3 KB

doc/images/chat-friends-1.png

27.9 KB

doc/images/chat-icon-1.png

4.94 KB
16 KB
13.2 KB

doc/images/create-tenant-6.png

36 KB

doc/images/create-tenant-7.png

40.6 KB

doc/images/dashboard1.PNG

139 KB

doc/images/default-dashboard3.png

80.5 KB

doc/images/download-angular-3.png

50.3 KB

doc/images/edit-person-core1.png

28.2 KB

doc/images/edit-user-3.png

80.5 KB

doc/images/edition-edit-1.png

43.1 KB
28.1 KB

doc/images/editions-page-core-4.png

23.3 KB

doc/images/email-activation-1.png

16.7 KB

doc/images/forgot-password-1.png

17.8 KB
32 KB
67.2 KB

doc/images/host-dashboard-1.png

180 KB
19.4 KB

doc/images/host-settings-invoice.png

30.6 KB
56.5 KB

doc/images/install-page-core.png

307 KB
16.9 KB
64.7 KB

doc/images/language-list-core-3.png

74.8 KB

doc/images/link-new-account-1.png

15.8 KB

doc/images/linked-accounts-3.png

24.3 KB

doc/images/localization-files-4.png

57.5 KB

doc/images/localization-files-5.png

8.92 KB
5.97 KB
38.9 KB

doc/images/login-as-host-3.png

539 KB

doc/images/login-as-host-5.png

24.7 KB

doc/images/login-as-trio1.png

574 KB

doc/images/login-as-trio3.png

24.6 KB

doc/images/login-attempts-1.png

109 KB

doc/images/login-screen-3.png

4.53 KB

doc/images/maintenance-cache-1.png

58.2 KB

doc/images/maintenance-logs-1.png

77.8 KB
31.6 KB

doc/images/ng2-layout-files-1.png

9.52 KB
27.3 KB

doc/images/notifications-icon-1.png

2.32 KB
29.2 KB

doc/images/npm-dependencies-core.png

51.2 KB
57.3 KB

doc/images/phone-book-edit-mode1.png

48 KB

doc/images/phone-book-edit-mode2.png

34.4 KB
31.4 KB
16.1 KB

doc/images/phonebook-empty-mpa2.png

27.4 KB

doc/images/phonebook-empty-ng2.png

36.7 KB

doc/images/phonebook-empty1.png

15.3 KB

doc/images/phonebook-empty2.png

12.2 KB
27.7 KB
20.5 KB
25.8 KB
40.9 KB
22.8 KB

doc/images/phonebook-tables-spa.png

19.9 KB

doc/images/recent-notifications-1.png

46.2 KB
29.2 KB

doc/images/role-management-core-3.png

26.2 KB
82 KB
86.2 KB
70.4 KB

doc/images/sample-invoice-core.png

40.5 KB

doc/images/search-people1.png

22.2 KB

doc/images/search-people2.png

17.5 KB
71.8 KB

doc/images/send-security-code-1.png

15.5 KB

doc/images/social-login-logos-3.png

29.2 KB
-5.02 KB

doc/images/subscription-1.png

18.5 KB
34.3 KB

doc/images/swagger-ui-ng2-1.png

78.3 KB

doc/images/tenant-create-modal-1.png

42.5 KB

doc/images/tenant-features-core-1.png

25.2 KB
26.8 KB
40.4 KB
39.6 KB

doc/images/tenant-settings-core-1.png

47.7 KB

doc/images/tenant-settings-ldap-1.png

67.2 KB

doc/images/tenant-signup-v3.png

26.7 KB

doc/images/user-management-core-3.png

119 KB

doc/images/user-menu-4.png

35.2 KB
16.7 KB

doc/images/user-permissions-1.png

81.1 KB
87.2 KB
6.07 KB

doc/images/user-settings-3.png

29.9 KB

doc/images/verify-security-code-1.png

13.9 KB

doc/images/visual-settings-core.png

42.6 KB

0 commit comments

Comments
 (0)