Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
ismcagdas committed Dec 3, 2024
2 parents e4e586f + af25bde commit ac785bc
Showing 14 changed files with 45 additions and 28 deletions.
18 changes: 9 additions & 9 deletions docs/en/Features-Angular-Host-Settings.md
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ You can also select a default edition, so a newly registered tenant will be assi

## User Management

![User Management Settings](images/host-settings-user-management-4.png)
![User Management Settings](images/host-settings-user-management-6.png)

User related settings can be configured under this tab. You can force email confirmation for login. You can enable phone number verification. Also, you can enable cookie consent so ASP.NET Zero shows a cookie consent bar for the users to accept cookie policy of your application.

@@ -43,17 +43,11 @@ You can enable/disable captcha on users login page.
You can also enable/disable session timeout control. If it is enable and the user does not provide any input to the site during the timeout period, a countdown modal will be displayed to user. If the user still does not provide an entry to the site during the modal countdown period, user will be log out.

Each tenant can allow tenant users to use Gravatar profile picture or not.

##### Password

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
Each tenant can allow tenant users to use Gravatar profile picture or not. Additionally, you can adjust the size of the profile picture in megabytes (MB) and set the dimensions in pixels (px) for width and height.

## Security

![Security Settings](images/host-settings-security-5.png)
![Security Settings](images/host-settings-security-6.png)

**Security** tab in host settings page contains password complexity settings. Host can define system wide password complexity settings in this tab. Each tenant can override this setting in tenant settings page.

@@ -65,6 +59,12 @@ This tab also contains user lock-out settings and two factor login settings as w
>
> * If user does not have a verified phone number, user will be logged in without sms verification.
##### Password

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.

## Email

![Email Settings](images/host-settings-email.png)
8 changes: 8 additions & 0 deletions docs/en/Features-Angular-Tenant-Settings.md
Original file line number Diff line number Diff line change
@@ -42,6 +42,14 @@ Each tenant can allow tenant users to use Gravatar profile picture or not.

Security tab contains password complexity settings. Each tenant can define password complexity settings in this tab for their account. Each tenant can also configure user lock out settings.

##### Password

If MultiTenancyEnabled is set to false, the password expiration settings will apply globally to all active users across the application, rather than being configurable for each tenant.

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.

## Invoice

![Invoice settings](images/tenant-settings-core-invoice.png)
18 changes: 9 additions & 9 deletions docs/en/Features-Mvc-Core-Host-Settings.md
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ You can also select a default edition, so a newly registered tenant will be assi

## User Management

![User Management Settings](images/host-settings-user-management-4.png)
![User Management Settings](images/host-settings-user-management-6.png)

User related settings can be configured under this tab. You can force email confirmation for login. You can enable phone number verification. Also, you can enable cookie consent so ASP.NET Zero shows a cookie consent bar for the users to accept cookie policy of your application.

@@ -43,22 +43,22 @@ You can enable/disable captcha on login page.
You can also enable/disable session timeout control. If it is enable and the user does not provide any input to the site during the timeout period, a countdown modal will be displayed to user. If the user still does not provide an entry to the site during the modal countdown period, user will be log out.

Each tenant can allow tenant users to use Gravatar profile picture or not.

##### Password

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.
Each tenant can allow tenant users to use Gravatar profile picture or not. Additionally, you can adjust the size of the profile picture in megabytes (MB) and set the dimensions in pixels (px) for width and height.

## Security

![Security Settings](images/host-settings-security-5.png)
![Security Settings](images/host-settings-security-6.png)

**Security** tab in host settings page contains password complexity settings. Host can define system wide password complexity settings in this tab. Each tenant can override this setting in tenant settings page.

This tab also contains user lock-out settings and two factor login settings as well.

##### Password

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.

## Email

![Email Settings](images/host-settings-email.png)
8 changes: 8 additions & 0 deletions docs/en/Features-Mvc-Core-Tenant-Settings.md
Original file line number Diff line number Diff line change
@@ -42,6 +42,14 @@ Each tenant can allow tenant users to use Gravatar profile picture or not.

Security tab contains password complexity settings. Each tenant can define password complexity settings in this tab for their account. Each tenant can also configure user lock out settings.

##### Password

If MultiTenancyEnabled is set to false, the password expiration settings will apply globally to all active users across the application, rather than being configurable for each tenant.

You can enable/disable password expiration on the settings page. If you enable it, users will have to change their password after defined days passed.

You can also prevent user's new password from being same as any of last x passwords. If you enable it, you will need to define how many previous password you want to prevent. Users will not be able to use some of the previously used password as a new password.

## Invoice

![Invoice settings](images/tenant-settings-core-invoice.png)
21 changes: 11 additions & 10 deletions docs/en/Public-Website.md
Original file line number Diff line number Diff line change
@@ -10,22 +10,23 @@ Note that, in development time script files are not minified. When you are publi

We are ready to run the application using Visual Studio. So, just run the application using Visual Studio and it will display the main page of the Public website project.

<img src="images/frontend-homepage.jpg" alt="Frontend home page" class="img-thumbnail" width="500" height="496" />
<div style="text-align: center;">
<img src="images/frontend-homepage.png" alt="Frontend home page" class="img-thumbnail text-center" width="700" height="398" />
</div>

There are two pages here: **Home Page** and **About**. Contents of these pages are just placeholders and for demo purposes. You can completely remove content and build your page upon your needs. Also, you should change the **logo** with your Company's logo.
There is one page here: **Home Page**. Content of this page is just placeholders and for demo purposes. You can completely remove content and build your page upon your needs. when you update the **logo** in the ASP.NET Zero application panel, the change will also be reflected on the Public Website.

See [metronic front-end theme](https://preview.keenthemes.com/free-bootstrap-corporate/) for all possibilities and components to build a richer web site.
See [metronic 8 landing page theme](https://preview.keenthemes.com/metronic8/demo1/landing.html) for all possibilities and components to build a richer web site.

Menus are defined in **FrontEndNavigationProvider** class. When you add a new menu item here, it will be automatically shown in the menu. There is a **Login** link at the top right corner. This link takes user to the **Login page** to enter to the **Angular** application. After the login, user will be redirected back to public website.
There is a **Login** link at the top right corner. This link takes the user to the **Login** page to enter the application. After logging in, the user will be redirected back to the public website. Additionally, there is a language switcher dropdown at the top right corner.

## Layout

Layout of front-end pages are located under **Views/Layout** folder:

<img src="images/frontend-layout-views-core.png" alt="Frontend layout views" class="img-thumbnail" width="193" height="253" />
<img src="images/frontend-layout-views-core.png" alt="Frontend layout views" class="img-thumbnail" />

**\_Layout** is the main layout file that includes scripts and styles. Language flags and the menu is rendered in **Header component** which is located under Shared/Components. \_PreFooter is not used but you can add
it to the \_Layout if you want.
**\_Layout** is the main layout file that includes scripts and styles. The menu is rendered in **Header component** which is located under Shared/Components.

## New Tenant Registration

@@ -35,15 +36,15 @@ When you click "**New Tenant**" link (at the top right area) you are redirected

Actually, this UI is located in the main application. When you pick an edition, you are redirected to the payment or register form depending on the button you clicked. Register form is shown as below:

<img src="images/tenant-signup-v3.png" alt="Tenant register form" class="img-thumbnail" />
<img src="images/tenant-signup-v4.png" alt="Tenant register form" class="img-thumbnail" />

## Single Sign On

Public web site has a login integration to the main application. When you click to login button (at the top right area) you are redirected to the main application. If you are already logged then you automatically
login in the public web site too. If not, you can enter your username and password to login. Then you are redirected back to the public web site and your username is shown at the top right:

<img src="images/public-web-site-login-username.png" alt="public web site login username" class="img-thumbnail" width="256" height="140" />
<img src="images/public-web-site-login-username.png" alt="public web site login username" class="img-thumbnail" />

To make this working, public web site must know URL of Angular app. This is configured in the **appsettings.json** of the **Web.Public** project, set **AdminWebSiteRootAddress** to root URL of the main application.
To make this working, public web site must know URL of app. This is configured in the **appsettings.json** of the **Web.Public** project, set **AdminWebSiteRootAddress** to root URL of the main application.

This configuration is properly set for the development environment. You should change it when you publish your project.
Binary file removed docs/en/images/frontend-homepage.jpg
Binary file not shown.
Binary file added docs/en/images/frontend-homepage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/images/frontend-layout-views-core.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/en/images/host-settings-security-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/images/new-tenant-select-edition-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/en/images/public-web-site-login-username.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/en/images/tenant-signup-v4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ac785bc

Please sign in to comment.