Skip to content

Commit 19f182c

Browse files
committed
Merge branch 'master' into dev
2 parents 2de8fdb + 982e555 commit 19f182c

14 files changed

+1049
-41
lines changed

doc/Development-Guide-Angular.md

+28-10
Original file line numberDiff line numberDiff line change
@@ -117,28 +117,46 @@ In addition to those fundamental modules, there are some share modules:
117117

118118
### Configuration
119119

120-
Angular solution contains src/assets/**appconfig.json** file which
121-
contains some configuration for the client side:
120+
The Angular solution file src/assets/**appconfig.json** contains some
121+
configuration for the client side. At runtime, the client scripts will
122+
download this file, and use it to calculate the address of the server-side
123+
API:
122124

123-
- **remoteServiceBaseUrl**: Used to configure base address of the
125+
- **remoteServiceBaseUrl**: Used to configure the base address of the
124126
server side APIs. Default value: http://localhost:22742
125-
- **appBaseUrl**: Used to configure base address of the client
127+
- **appBaseUrl**: Used to configure the base address of the client
126128
application. Default value: http://localhost:4200
127129

128-
**appBaseUrl** is configured since we use it to define format of our
129-
URL. If we want to use tenancy name as subdomain for a multi-tenant
130+
The purpose of **appBaseUrl** is to enable the Angular client to decompose
131+
the browser address into tenant-name + base-url.
132+
133+
#### Subdomain Multi-Tenancy
134+
135+
If we want to use the tenancy name as a subdomain for a multi-tenant
130136
application then we can define **appBaseUrl** as
131137

132138
http://**{TENANCY\_NAME}**.mydomain.com
133139

134140
{TENANCY\_NAME} is the place holder here for tenant names. Tenancy name
135-
can also be configured for **remoteServiceBaseUrl** as similar. To make
136-
tenancy name subdomains properly work, we should also make two
137-
configurations beside the application:
141+
must be similarly configured for **remoteServiceBaseUrl**.
142+
143+
It's important to understand that subdomain multi-tenancy is a function
144+
of the `DomainTenantResolveContributor` server-side class.
145+
This means that the server API **must** be accessed via a sub-domain that
146+
conforms to the format you have defined during your configuration of
147+
AspNetBoilerplate (see
148+
[Multi-Tenancy](https://github.com/aspnetboilerplate/aspnetboilerplate/blob/dev/doc/WebSite/Multi-Tenancy.md#determining-current-tenant) regarding preinitialization).
149+
150+
<img src="images/angular2-core-subdomain-tenant-resolution-sequence.png" alt="Angular ASP.NET Core Sub-Domain Tenancy Overview" class="img-thumbnail" width="540" height="379" />
151+
152+
To complete the setup of subdomain tenancy, we should also make two
153+
infrastructural configurations:
138154

139155
1. We should configure DNS to redirect all subdomains to a static IP
140156
address. To declare 'all subdomains', we can use wildcard like
141-
**\*.mydomain.com**.
157+
**\*.mydomain.com**. Note that if you have a split Angular/API
158+
setup, then you will need 2 subdomain formats, such as
159+
**\*.app.mydomain.com** and **\*.api.mydomain.com**.
142160
2. We should configure IIS to bind this static IP to our application.
143161

144162
There may be other ways of doing it but this is the most simple way.

doc/Step-by-step-publish-to-azure-angular.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ Select "**azure-publish-demo-server**" and click "**OK**", then click "**Publish
8383
The details will be explained in the next lines. Here are the quick steps to publish the **AngularUI** to the Azure
8484

8585
- Run the `yarn` command to restore packages
86-
- Run the `ng build -prod`
86+
- Run the `ng build --prod`
8787
- Copy the web.config file that is placed in **angular** folder root to dist folder
8888
- Configure the **angular/dist/assets/appconfig.json**
8989
- Send the required files to the Azure
9090

9191
### Prepare The Publish Folder
9292

93-
Run the `yarn` command to restore packages and run the `ng build -prod` to create publish folder that named **dist**.
93+
Run the `yarn` command to restore packages and run the `ng build --prod` to create publish folder that named **dist**.
9494

9595
<img src="images/azure-publish-angular-publish-angular.png">
9696

Loading

docs/en/Change-Logs.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,20 @@ jQuery and ASP.NET Core + Angular versions beginning from v4.1. See
66

77
The change logs in this page are just a summary of major changes. Detailed release notes are shared on the Github repository (only available to the customers).
88

9-
### v6.5 (2019-01-11)
9+
## v6.6.1 (2019-02-11)
10+
11+
* Upgraded Xamarin package dependencies.
12+
* Bug fixes.
13+
14+
## v6.6 (2019-02-08)
15+
16+
* Implemented Metronic [demo6](https://keenthemes.com/metronic/preview/?demo=demo6) and [demo10](https://keenthemes.com/metronic/preview/?demo=demo10) layouts.
17+
* Implemented refresh token for the Xamarin app.
18+
* Switched to Google OAuth2 from Google+ API.
19+
* Upgraded to ABP v4.2.
20+
* Minor features, enhancements and bug fixes.
21+
22+
## v6.5 (2019-01-11)
1023

1124
- Implemented recurring payments for subscriptions (using [Stripe](https://stripe.com/))
1225
- Upgraded to PrimeNG v7.0.

0 commit comments

Comments
 (0)