Browse Source

Merge pull request #9504 from abpframework/auto-merge/rel-4-4/466

Merge branch dev with rel-4.4
pull/9511/head
Mehmet Erim 5 years ago
committed by GitHub
parent
commit
dcb2cb533c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      docs/en/Tutorials/Part-1.md
  2. 6
      docs/en/Tutorials/Part-10.md
  3. 6
      docs/en/Tutorials/Part-7.md
  4. BIN
      docs/en/Tutorials/images/bookstore-efcore-migration-authors.png
  5. BIN
      docs/en/Tutorials/images/bookstore-efcore-migration.png
  6. 21
      modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
  7. 6
      npm/ng-packs/apps/dev-app/src/app/app.module.ts
  8. 2
      npm/ng-packs/apps/dev-app/src/app/home/home.component.html
  9. 4
      npm/ng-packs/apps/dev-app/src/environments/environment.ts
  10. 1
      npm/ng-packs/package.json
  11. 2
      npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
  12. 2
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
  13. 117
      npm/ng-packs/yarn.lock
  14. 2
      templates/app/angular/src/app/home/home.component.html
  15. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
  16. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml

28
docs/en/Tutorials/Part-1.md

@ -142,28 +142,36 @@ public class BookStoreMongoDbContext : AbpMongoDbContext
### Map the Book Entity to a Database Table ### Map the Book Entity to a Database Table
Open `BookStoreDbContextModelCreatingExtensions.cs` file in the `Acme.BookStore.EntityFrameworkCore` project and add the mapping code for the `Book` entity. The final class should be the following: Locate to `OnModelCreating` method in the `BookStoreDbContext` class and add the mapping code for the `Book` entity:
````csharp ````csharp
using Acme.BookStore.Books; using Acme.BookStore.Books;
using Microsoft.EntityFrameworkCore; ...
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
namespace Acme.BookStore.EntityFrameworkCore namespace Acme.BookStore.EntityFrameworkCore
{ {
public static class BookStoreDbContextModelCreatingExtensions public class BookStoreDbContext :
AbpDbContext<BookStoreDbContext>,
IIdentityDbContext,
ITenantManagementDbContext
{ {
public static void ConfigureBookStore(this ModelBuilder builder) ...
protected override void OnModelCreating(ModelBuilder builder)
{ {
Check.NotNull(builder, nameof(builder)); base.OnModelCreating(builder);
/* Include modules to your migration db context */
builder.ConfigurePermissionManagement();
...
/* Configure your own tables/entities inside here */ /* Configure your own tables/entities inside here */
builder.Entity<Book>(b => builder.Entity<Book>(b =>
{ {
b.ToTable(BookStoreConsts.DbTablePrefix + "Books", b.ToTable(BookStoreConsts.DbTablePrefix + "Books",
BookStoreConsts.DbSchema); BookStoreConsts.DbSchema);
b.ConfigureByConvention(); //auto configure for the base class props b.ConfigureByConvention(); //auto configure for the base class props
b.Property(x => x.Name).IsRequired().HasMaxLength(128); b.Property(x => x.Name).IsRequired().HasMaxLength(128);
}); });
@ -179,7 +187,7 @@ namespace Acme.BookStore.EntityFrameworkCore
The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database. The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database.
Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore.DbMigrations` project and type the following command: Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore` project and type the following command:
```bash ```bash
dotnet ef migrations add Created_Book_Entity dotnet ef migrations add Created_Book_Entity
@ -189,7 +197,7 @@ This will add a new migration class to the project:
![bookstore-efcore-migration](./images/bookstore-efcore-migration.png) ![bookstore-efcore-migration](./images/bookstore-efcore-migration.png)
> If you are using Visual Studio, you may want to use `Add-Migration Created_Book_Entity -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore.DbMigrations` is the *Default Project* in PMC. > If you are using Visual Studio, you may want to use `Add-Migration Created_Book_Entity -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore` is the *Default Project* in PMC.
{{end}} {{end}}

6
docs/en/Tutorials/Part-10.md

@ -70,7 +70,7 @@ We prefer to **delete the database** {{if DB=="EF"}}(you can run the `Drop-Datab
### Update the EF Core Mapping ### Update the EF Core Mapping
Open the `BookStoreDbContextModelCreatingExtensions` class under the `EntityFrameworkCore` folder of the `Acme.BookStore.EntityFrameworkCore` project and change the `builder.Entity<Book>` part as shown below: Locate to `OnModelCreating` method in the `BookStoreDbContext` class that under the `EntityFrameworkCore` folder of the `Acme.BookStore.EntityFrameworkCore` project and change the `builder.Entity<Book>` part as shown below:
````csharp ````csharp
builder.Entity<Book>(b => builder.Entity<Book>(b =>
@ -88,7 +88,7 @@ builder.Entity<Book>(b =>
The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database. The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database.
Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore.DbMigrations` project and type the following command: Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore` project and type the following command:
````bash ````bash
dotnet ef migrations add Added_AuthorId_To_Book dotnet ef migrations add Added_AuthorId_To_Book
@ -121,7 +121,7 @@ migrationBuilder.AddForeignKey(
* Creates an index on the `AuthorId` field. * Creates an index on the `AuthorId` field.
* Declares the foreign key to the `AppAuthors` table. * Declares the foreign key to the `AppAuthors` table.
> If you are using Visual Studio, you may want to use `Add-Migration Added_AuthorId_To_Book -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore.DbMigrations` is the *Default Project* in PMC. > If you are using Visual Studio, you may want to use `Add-Migration Added_AuthorId_To_Book -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore` is the *Default Project* in PMC.
{{end}} {{end}}

6
docs/en/Tutorials/Part-7.md

@ -48,7 +48,7 @@ Open the `BookStoreDbContext` in the `Acme.BookStore.EntityFrameworkCore` projec
public DbSet<Author> Authors { get; set; } public DbSet<Author> Authors { get; set; }
```` ````
Then open the `BookStoreDbContextModelCreatingExtensions` class in the same project and add the following lines to the end of the `ConfigureBookStore` method: Then locate to the `OnModelCreating` method in `BookStoreDbContext` class in the same project and add the following lines to the end of the method:
````csharp ````csharp
builder.Entity<Author>(b => builder.Entity<Author>(b =>
@ -72,7 +72,7 @@ This is just like done for the `Book` entity before, so no need to explain again
The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database. The startup solution is configured to use [Entity Framework Core Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/). Since we've changed the database mapping configuration, we should create a new migration and apply changes to the database.
Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore.DbMigrations` project and type the following command: Open a command-line terminal in the directory of the `Acme.BookStore.EntityFrameworkCore` project and type the following command:
````bash ````bash
dotnet ef migrations add Added_Authors dotnet ef migrations add Added_Authors
@ -88,7 +88,7 @@ You can apply changes to the database using the following command, in the same c
dotnet ef database update dotnet ef database update
```` ````
> If you are using Visual Studio, you may want to use `Add-Migration Added_Authors -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore.DbMigrations` is the *Default Project* in PMC. > If you are using Visual Studio, you may want to use `Add-Migration Added_Authors -c BookStoreMigrationsDbContext` and `Update-Database -c BookStoreMigrationsDbContext` commands in the *Package Manager Console (PMC)*. In this case, ensure that {{if UI=="MVC"}}`Acme.BookStore.Web`{{else if UI=="BlazorServer"}}`Acme.BookStore.Blazor`{{else if UI=="Blazor" || UI=="NG"}}`Acme.BookStore.HttpApi.Host`{{end}} is the startup project and `Acme.BookStore.EntityFrameworkCore` is the *Default Project* in PMC.
{{else if DB=="Mongo"}} {{else if DB=="Mongo"}}

BIN
docs/en/Tutorials/images/bookstore-efcore-migration-authors.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
docs/en/Tutorials/images/bookstore-efcore-migration.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

21
modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs

@ -4,6 +4,8 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.EventBus.Distributed;
using Volo.Abp.MultiTenancy;
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
namespace Volo.Abp.TenantManagement namespace Volo.Abp.TenantManagement
@ -14,15 +16,18 @@ namespace Volo.Abp.TenantManagement
protected IDataSeeder DataSeeder { get; } protected IDataSeeder DataSeeder { get; }
protected ITenantRepository TenantRepository { get; } protected ITenantRepository TenantRepository { get; }
protected ITenantManager TenantManager { get; } protected ITenantManager TenantManager { get; }
protected IDistributedEventBus DistributedEventBus { get; }
public TenantAppService( public TenantAppService(
ITenantRepository tenantRepository, ITenantRepository tenantRepository,
ITenantManager tenantManager, ITenantManager tenantManager,
IDataSeeder dataSeeder) IDataSeeder dataSeeder,
IDistributedEventBus distributedEventBus)
{ {
DataSeeder = dataSeeder; DataSeeder = dataSeeder;
TenantRepository = tenantRepository; TenantRepository = tenantRepository;
TenantManager = tenantManager; TenantManager = tenantManager;
DistributedEventBus = distributedEventBus;
} }
public virtual async Task<TenantDto> GetAsync(Guid id) public virtual async Task<TenantDto> GetAsync(Guid id)
@ -63,10 +68,22 @@ namespace Volo.Abp.TenantManagement
await CurrentUnitOfWork.SaveChangesAsync(); await CurrentUnitOfWork.SaveChangesAsync();
await DistributedEventBus.PublishAsync(
new TenantCreatedEto
{
Id = tenant.Id,
Name = tenant.Name,
Properties =
{
{ "AdminEmail", input.AdminEmailAddress },
{ "AdminPassword", input.AdminPassword }
}
});
using (CurrentTenant.Change(tenant.Id, tenant.Name)) using (CurrentTenant.Change(tenant.Id, tenant.Name))
{ {
//TODO: Handle database creation? //TODO: Handle database creation?
// TODO: Seeder might be triggered via event handler.
await DataSeeder.SeedAsync( await DataSeeder.SeedAsync(
new DataSeedContext(tenant.Id) new DataSeedContext(tenant.Id)
.WithProperty("AdminEmail", input.AdminEmailAddress) .WithProperty("AdminEmail", input.AdminEmailAddress)

6
npm/ng-packs/apps/dev-app/src/app/app.module.ts

@ -9,7 +9,6 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { InspectorModule } from '@ngneat/inspector';
import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin'; import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { environment } from '../environments/environment'; import { environment } from '../environments/environment';
@ -17,10 +16,7 @@ import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { APP_ROUTE_PROVIDER } from './route.provider'; import { APP_ROUTE_PROVIDER } from './route.provider';
const INSPECTION_TOOLS = [ const INSPECTION_TOOLS = [NgxsLoggerPluginModule.forRoot({ disabled: true })];
NgxsLoggerPluginModule.forRoot({ disabled: true }),
InspectorModule.forRoot(),
];
@NgModule({ @NgModule({
imports: [ imports: [

2
npm/ng-packs/apps/dev-app/src/app/home/home.component.html

@ -1,6 +1,6 @@
<div class="container"> <div class="container">
<div class="p-5 text-center"> <div class="p-5 text-center">
<div class="badge badge-success h5 rounded mb-4" role="alert"> <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4" role="alert">
<h5 class="m-1"> <h5 class="m-1">
<i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is
successfully running! successfully running!

4
npm/ng-packs/apps/dev-app/src/environments/environment.ts

@ -15,8 +15,8 @@ export const environment = {
clientId: 'MyProjectName_App', clientId: 'MyProjectName_App',
dummyClientSecret: '1q2w3e*', dummyClientSecret: '1q2w3e*',
scope: 'offline_access MyProjectName', scope: 'offline_access MyProjectName',
// responseType: 'code', responseType: 'code',
// redirectUri: baseUrl redirectUri: baseUrl,
}, },
apis: { apis: {
default: { default: {

1
npm/ng-packs/package.json

@ -55,7 +55,6 @@
"@angular/router": "~11.1.0", "@angular/router": "~11.1.0",
"@fortawesome/fontawesome-free": "^5.14.0", "@fortawesome/fontawesome-free": "^5.14.0",
"@ng-bootstrap/ng-bootstrap": "^7.0.0", "@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@ngneat/inspector": "^1.0.0",
"@ngneat/spectator": "^5.13.0", "@ngneat/spectator": "^5.13.0",
"@ngx-validate/core": "^0.0.13", "@ngx-validate/core": "^0.0.13",
"@ngxs/devtools-plugin": "^3.7.0", "@ngxs/devtools-plugin": "^3.7.0",

2
npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html

@ -3,7 +3,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-12 col-md-3"> <div class="col-12 col-md-3 mb-2 mb-md-0">
<ul class="nav flex-column nav-pills" id="nav-tab" role="tablist"> <ul class="nav flex-column nav-pills" id="nav-tab" role="tablist">
<ng-container *abpFor="let setting of settings; trackBy: trackByFn"> <ng-container *abpFor="let setting of settings; trackBy: trackByFn">
<li <li

2
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html

@ -1,5 +1,5 @@
<div class="row justify-content-end mx-n1" id="AbpContentToolbar"> <div class="row justify-content-end mx-n1" id="AbpContentToolbar">
<div class="col-auto px-1 pt-2" *ngFor="let action of actionList; trackBy: trackByFn"> <div class="col-auto px-1 pt-0 pt-md-2" *ngFor="let action of actionList; trackBy: trackByFn">
<ng-container *ngIf="action.visible(data)"> <ng-container *ngIf="action.visible(data)">
<ng-container *abpPermission="action.permission"> <ng-container *abpPermission="action.permission">
<ng-container *ngIf="action.component as component; else button"> <ng-container *ngIf="action.component as component; else button">

117
npm/ng-packs/yarn.lock

@ -2,20 +2,27 @@
# yarn lockfile v1 # yarn lockfile v1
"@abp/ng.components@~4.3.3": "@abp/ng.account.core@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-4.3.3.tgz#2c2f39742c6291c8aa8cd6ad7b1640a3519b70de" resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-4.4.0-rc.1.tgz#1ad64c69327f4216e8d3f76cf12ea69f1c8e936d"
integrity sha512-15A377nLqPL+VtD8rvhSmTq/aLkDzBKWKoUi/kBl2b+Khnu/yQu921sqXiIkGq02sc2ld+/1BuBYsqdlBKQrEQ== integrity sha512-erH5ZL63+Qs6hESPUUIA8qsDMguhFDyCgvbridqDNSEZdzA8cSO7KdjM0+XA77NbLItkHK/HRl80sEAOyY+myw==
dependencies:
tslib "^2.0.0"
"@abp/ng.components@~4.4.0-rc.1":
version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-4.4.0-rc.1.tgz#4b7880a9a3f178468ee4b0c19746da8355ab36f2"
integrity sha512-BS5ekimWPm5OMM4cYMOS3gErRgl7k3aHV1RHCqA5pnVVBWFSyi2E0H93o42mmpxpv5nPENal1R8NaCd2Wxf1wA==
dependencies: dependencies:
ng-zorro-antd "^11.0.0" ng-zorro-antd "^11.0.0"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.core@~4.3.3": "@abp/ng.core@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-4.3.3.tgz#fd57c8f7546f6e0f23cc8190bbd99e73ab0c7b59" resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-4.4.0-rc.1.tgz#d8b0640e515e9ee8f039b910d6b3570104d7e33b"
integrity sha512-GMf3bQnEr1WHKX+RzArlmPV2Kq5sxJnq6cy91C1tkhBC7kagjWZvWk1YnufAmfVHteiJdomrzi/Im2s7cwLt+w== integrity sha512-qnP9HICCyehvzoEc0r6CXcs6vktDGLqPptmZiLlGULXPRQdd2DUpNv6INvKvOApiBMu/W9Tqbd6eZdwx1zAqfQ==
dependencies: dependencies:
"@abp/utils" "^4.3.2" "@abp/utils" "^4.4.0-rc.1"
"@angular/localize" "~10.0.10" "@angular/localize" "~10.0.10"
"@ngxs/store" "^3.7.0" "@ngxs/store" "^3.7.0"
angular-oauth2-oidc "^10.0.0" angular-oauth2-oidc "^10.0.0"
@ -25,35 +32,35 @@
ts-toolbelt "6.15.4" ts-toolbelt "6.15.4"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.feature-management@~4.3.3": "@abp/ng.feature-management@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-4.3.3.tgz#7a35a24b81b9c6a488c7df47a6cce047f048ed3e" resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-4.4.0-rc.1.tgz#f4777a65571ba04dac92dbc23b71d71e9d68ff5b"
integrity sha512-Tloesl4BdqFmylsx0sOUc1de9vLBX/6lmz5YJRBGIYVerWIHbr3cXxCRQrhkRTiBsC97tsdqDB9qmmmrVqvv6Q== integrity sha512-+A/fvT7UGV3/XCC0/WEt2li/0t1JxYm+HItEHaBNCzwT8No+v9EClD2uHO2LGDFms5/j8P3Ap61lGHGcwgjaJw==
dependencies: dependencies:
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.identity@~4.3.3": "@abp/ng.identity@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-4.3.3.tgz#ba0a8e6b581aded4a22704d3169d0e3a90266211" resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-4.4.0-rc.1.tgz#ce5b2f6b52b97b0bff87e85144097300cdbf2a90"
integrity sha512-PqoYbmkF7NnJ4HvlX/A+OYGmAMc9OmMc7dxTP+sWBS0/dMPLJcuAwURd5DbRHSgL64SoJOZpdk4GWeev3YtQTA== integrity sha512-Fye/t+G6k/DBnAqk1zDxJo3p8ad2fRmzOBV0LTr9b5QVX5Qfbk74VDRED70KYrGn+oL8HD23HuLgGNZO1eCJpg==
dependencies: dependencies:
"@abp/ng.permission-management" "~4.3.3" "@abp/ng.permission-management" "~4.4.0-rc.1"
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.permission-management@~4.3.3": "@abp/ng.permission-management@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-4.3.3.tgz#754726aed4356d8dd25cc62e1733606d8911dd67" resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-4.4.0-rc.1.tgz#fefde68d532e4a3556071792cc428d0c943c359c"
integrity sha512-HarDSgGIHrq8BNVoa83QT24x2H8hO/lA3dR/HbJsG4pddlhCBoLqfJWsEDmxZyKR8StORGpVF4bB/lCpgTFYnw== integrity sha512-uzA36OwryQcDSevzqfFfOra7f1O/ix/cn7ItkReFQGE148fpg5gH55gua/tl+qAEjWYBPCpfaZH8FKSPD2Bv/Q==
dependencies: dependencies:
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.schematics@~4.3.3": "@abp/ng.schematics@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.3.3.tgz#90b1d5e46331a79e97cc24f019006deb91c35931" resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.4.0-rc.1.tgz#6c5179d75e7409b2efd3153ad87dae2561cb4c9b"
integrity sha512-6AzdsLFoWrqmK/2QLBSK1BQoCzmHSVdRB3OnR3vpBteO4d2bQVqIoRups9p5hsXH85UF1qWFEPujKwz7gzj2tw== integrity sha512-9nrBUa1mx88VvhVJupODFb/8rKq4ZBUXGK1Fjrt0oXfsXvKreQ3egHOmXhvRkVYkYm3sUkXS2CwddXoGm3/uQw==
dependencies: dependencies:
"@angular-devkit/core" "~11.0.2" "@angular-devkit/core" "~11.0.2"
"@angular-devkit/schematics" "~11.0.2" "@angular-devkit/schematics" "~11.0.2"
@ -62,38 +69,39 @@
should-quote "^1.0.0" should-quote "^1.0.0"
typescript "~3.9.2" typescript "~3.9.2"
"@abp/ng.setting-management@~4.3.3": "@abp/ng.setting-management@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-4.3.3.tgz#415e4b7a709de211e68e501c2b04bd5646628ecd" resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-4.4.0-rc.1.tgz#6dfe99eef262ed1d780682d37c58cf1bf174fecf"
integrity sha512-Jnsvacge58zZXytP0HwrUQaub3XvzCqtU/xCJdYmFaRPxfuhpDjXRPQvWIFrccHEuZoh9XIM3srD+GXhmRJjIQ== integrity sha512-YH6f6a76rLcZPvcbEkfF0hbyPAc8qClfdGvCX2lFIrd9aCR2fsPcNAK0Ro1H40YAtWZdHvs2PWwcLJs7dJaqqg==
dependencies: dependencies:
"@abp/ng.components" "~4.3.3" "@abp/ng.components" "~4.4.0-rc.1"
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.tenant-management@~4.3.3": "@abp/ng.tenant-management@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-4.3.3.tgz#d7cac0bd2f8667d1e80074d695a10573647a47f9" resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-4.4.0-rc.1.tgz#4ed9c5a2a9c59622653a0db889163ce42430a7d9"
integrity sha512-pW93Id/od+r15WO9qkPtPn5UkyhiyYfQt0MD5YFUNYX1ArHsxYLitJAlmRsR5ISQVFDDltjX1skfTx3//f5vdg== integrity sha512-y20T9TpQg4iCbYixEmgwyno8fOcF6BWP7pxVpcNWWFJqR+QYvCFUYRS0hPvTU9PTsdvCGlzwXKL9Pb/rCv6PEA==
dependencies: dependencies:
"@abp/ng.feature-management" "~4.3.3" "@abp/ng.feature-management" "~4.4.0-rc.1"
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.theme.basic@~4.3.3": "@abp/ng.theme.basic@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-4.3.3.tgz#c7b0f21f98d1fab9b1577a760366cf5b313468b3" resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-4.4.0-rc.1.tgz#65c4748c919106e49d78ca28a6b93f4dfde3e97b"
integrity sha512-06Q5iqAmlgsGKLk6XNERHs2slPnT0SdgrO6JgzLcn7e/RPtAF3MkIW/5BEIVPKv1fJFN38x6ht0NvJWzcB2C4g== integrity sha512-u7HMHgeW9ly/Nrs1xXHeDbcg0V6OuD9tYXQ34YJKQhkJzMO4tsuYWLvlyfoSRhdFRxmTSAIypLhDEbpcWO1mHA==
dependencies: dependencies:
"@abp/ng.theme.shared" "~4.3.3" "@abp/ng.account.core" "~4.4.0-rc.1"
"@abp/ng.theme.shared" "~4.4.0-rc.1"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/ng.theme.shared@~4.3.3": "@abp/ng.theme.shared@~4.4.0-rc.1":
version "4.3.3" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.3.3.tgz#439adf61fbcce49969c931571619678aa0d4f7a2" resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.4.0-rc.1.tgz#0695ecd4ef77b8f0708590d80211f51731b4a309"
integrity sha512-xE/6mQywVCxNv6uoe7sUuVwZcJh1sW0W4bfkuGe+wNpl6ZcXJzbgC9+QxWLfGp0jHdEbCaEbDnsmkk7ulOghRg== integrity sha512-yTn7NnZbLoe5BE7dTJWBgzOOYS6Ekjnp9xcAxFBrOvBc76+Dv0TekRTtaGANNFXAXieodeF2cbnMssO+B265Fg==
dependencies: dependencies:
"@abp/ng.core" "~4.3.3" "@abp/ng.core" "~4.4.0-rc.1"
"@fortawesome/fontawesome-free" "^5.14.0" "@fortawesome/fontawesome-free" "^5.14.0"
"@ng-bootstrap/ng-bootstrap" "^7.0.0" "@ng-bootstrap/ng-bootstrap" "^7.0.0"
"@ngx-validate/core" "^0.0.13" "@ngx-validate/core" "^0.0.13"
@ -102,13 +110,6 @@
chart.js "^2.9.3" chart.js "^2.9.3"
tslib "^2.0.0" tslib "^2.0.0"
"@abp/utils@^4.3.2":
version "4.3.2"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.3.2.tgz#ff8fa921aadf8ec6d1d8eb0572133907c19ac6e5"
integrity sha512-xUycN1bW+gTVfD0WJHXG5UbqAqAg/dVrZ/pXlnEGixp04vXwTI+o5oWTV2rQYiOyLbPzmpjSAZmxrkIcAgIQ1A==
dependencies:
just-compare "^1.3.0"
"@abp/utils@^4.4.0-rc.1": "@abp/utils@^4.4.0-rc.1":
version "4.4.0-rc.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6"

2
templates/app/angular/src/app/home/home.component.html

@ -1,6 +1,6 @@
<div class="container"> <div class="container">
<div class="p-5 text-center"> <div class="p-5 text-center">
<div class="badge badge-success h5 rounded mb-4" role="alert"> <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4" role="alert">
<h5 class="m-1"> <h5 class="m-1">
<i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is
successfully running! successfully running!

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml

@ -13,7 +13,7 @@
} }
<div class="container"> <div class="container">
<div class="p-5 text-center"> <div class="p-5 text-center">
<div class="badge badge-success h5 rounded mb-4 " role="alert"> <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4 " role="alert">
<h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5> <h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5>
</div> </div>
<h1>Welcome to the Application</h1> <h1>Welcome to the Application</h1>

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml

@ -13,7 +13,7 @@
} }
<div class="container"> <div class="container">
<div class="p-5 text-center"> <div class="p-5 text-center">
<div class="badge badge-success h5 rounded mb-4 " role="alert"> <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4 " role="alert">
<h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5> <h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5>
</div> </div>
<h1>Welcome to the Application</h1> <h1>Welcome to the Application</h1>

Loading…
Cancel
Save