tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat: use NgbNavModule instead of NgbTabsetModule

pull/4485/head
mehmet-erim 6 years ago
parent
0b9b7444eb
commit
61524bd6f9
3 changed files with 108 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 185
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  2. 4
      npm/ng-packs/packages/identity/src/lib/identity.module.ts
  3. 13
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa

185
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
View File

@ -102,109 +102,110 @@
></ng-template> ></ng-template>
<form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()"> <form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()">
<ngb-tabset> <ul ngbNav #nav="ngbNav" class="nav-tabs">
<ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization"> <li ngbNavItem>
<ng-template ngbTabContent> <a ngbNavLink>{{ 'AbpIdentity::UserInformations' | abpLocalization }}</a>
<div class="mt-2 fade-in-top"> <ng-template ngbNavContent>
<div class="form-group"> <div class="form-group">
<label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
><span> * </span> ><span> * </span>
<input <input
type="text" type="text"
id="user-name" id="user-name"
class="form-control" class="form-control"
formControlName="userName" formControlName="userName"
autofocus autofocus
/> />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label> <label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label>
<input type="text" id="name" class="form-control" formControlName="name" /> <input type="text" id="name" class="form-control" formControlName="name" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="surname">{{ <label for="surname">{{
'AbpIdentity::DisplayName:Surname' | abpLocalization 'AbpIdentity::DisplayName:Surname' | abpLocalization
}}</label> }}</label>
<input type="text" id="surname" class="form-control" formControlName="surname" /> <input type="text" id="surname" class="form-control" formControlName="surname" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label <label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label
><span *ngIf="!selected.userName"> * </span> ><span *ngIf="!selected.userName"> * </span>
<input <input
type="password" type="password"
id="password" id="password"
autocomplete="new-password" autocomplete="new-password"
class="form-control" class="form-control"
formControlName="password" formControlName="password"
/> />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label <label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label
><span> * </span> ><span> * </span>
<input type="text" id="email" class="form-control" formControlName="email" /> <input type="text" id="email" class="form-control" formControlName="email" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label> <label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label>
<input <input
type="text" type="text"
id="phone-number" id="phone-number"
class="form-control" class="form-control"
formControlName="phoneNumber" formControlName="phoneNumber"
/> />
</div> </div>
<div class="custom-checkbox custom-control mb-2"> <div class="custom-checkbox custom-control mb-2">
<input <input
type="checkbox" type="checkbox"
id="lockout-checkbox" id="lockout-checkbox"
class="custom-control-input" class="custom-control-input"
formControlName="lockoutEnabled" formControlName="lockoutEnabled"
/> />
<label class="custom-control-label" for="lockout-checkbox">{{ <label class="custom-control-label" for="lockout-checkbox">{{
'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization 'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization
}}</label> }}</label>
</div> </div>
<div class="custom-checkbox custom-control mb-2"> <div class="custom-checkbox custom-control mb-2">
<input <input
type="checkbox" type="checkbox"
id="two-factor-checkbox" id="two-factor-checkbox"
class="custom-control-input" class="custom-control-input"
formControlName="twoFactorEnabled" formControlName="twoFactorEnabled"
/> />
<label class="custom-control-label" for="two-factor-checkbox">{{ <label class="custom-control-label" for="two-factor-checkbox">{{
'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization 'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization
}}</label> }}</label>
</div>
</div> </div>
</ng-template> </ng-template>
</ngb-tab> </li>
<ngb-tab [title]="'AbpIdentity::Roles' | abpLocalization">
<ng-template ngbTabContent> <li ngbNavItem>
<div class="mt-2 fade-in-top"> <a ngbNavLink>{{ 'AbpIdentity::Roles' | abpLocalization }}</a>
<div <ng-template ngbNavContent>
*ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn" <div
class="custom-checkbox custom-control mb-2" *ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn"
> class="custom-checkbox custom-control mb-2"
<input >
type="checkbox" <input
class="custom-control-input" type="checkbox"
[attr.id]="'roles-' + i" class="custom-control-input"
[formControl]="roleGroup.controls[roles[i].name]" [attr.id]="'roles-' + i"
/> [formControl]="roleGroup.controls[roles[i].name]"
<label class="custom-control-label" [attr.for]="'roles-' + i">{{ />
roles[i].name <label class="custom-control-label" [attr.for]="'roles-' + i">{{
}}</label> roles[i].name
</div> }}</label>
</div> </div>
</ng-template> </ng-template>
</ngb-tab> </li>
</ngb-tabset> </ul>
<div class="mt-2 fade-in-top" [ngbNavOutlet]="nav"></div>
</form> </form>
</ng-template> </ng-template>

4
npm/ng-packs/packages/identity/src/lib/identity.module.ts
View File

@ -2,7 +2,7 @@ import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
import { PermissionManagementModule } from '@abp/ng.permission-management'; import { PermissionManagementModule } from '@abp/ng.permission-management';
import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core'; import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
import { NgbDropdownModule, NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { RolesComponent } from './components/roles/roles.component'; import { RolesComponent } from './components/roles/roles.component';
@ -17,7 +17,7 @@ import { IdentityState } from './states/identity.state';
NgxsModule.forFeature([IdentityState]), NgxsModule.forFeature([IdentityState]),
CoreModule, CoreModule,
IdentityRoutingModule, IdentityRoutingModule,
NgbTabsetModule, NgbNavModule,
ThemeSharedModule, ThemeSharedModule,
NgbDropdownModule, NgbDropdownModule,
PermissionManagementModule, PermissionManagementModule,

13
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa
View File

@ -0,0 +1,13 @@
{
"KeyId": "f788zGVUZh9H-HbWL1S-Mg",
"Parameters": {
"D": "F19hbC5PLO872DszGiJnVoU55ee7XGXmNf0KEKndJ/uGBv5lWklXA0QF80h1ytWXde0jV5isQPB1t7mPhRQlDoDTkywLi1CeOgBPbxzHEfLjZZ5c4olfeX0IJX9BDqgUntY0H1a/+Om/eDu4OZUz3EIJFFZBgz46YZSyTT6ZDvAEdpC/o66sNJmxvJIp+8zVoVDSqBUzxmc+oEamXLg7r2jdymxJMxau1kQFxEGLOrJnNxGsEe8UrYA3qSsm8m/Xg4uOh7RYgnuEEt88+KTvRq+CAMWhN3YNLtOJ3NmXowwE7e1Ma+jih9+UVfxZn14P5+SOJbQ2bYV2sCV+2vBiCQ==",
"DP": "oPiGO/qdOQfFEAS9fMInQnsrNylIZVpDYEVoDJ6/jQfE/IpuwxGcmsaGvCob3SKxZiJRLCWpwJYo1hCh/JOSVGWMkVyELky56nbbkkV5ymKLSGZ4JoetdQs+GchnPdR+k2P9Ij1Kjk13ylubN3htzNhcBASJpOfSEv5pPVzGKX0=",
"DQ": "z6imxLABHkyftbfUUtpeOlPanEHgpuIjmUdp3T1Ju1jziE63UEhuj0GPAXOF17uYxixwYE8JhOJ7+TyIK9oZeI3zH2OzJqQh8f5PCQ/E+0ULXZDeNV/ShDLCTufu3Fis9Rt64uTp/H/l21oMQ79jc0ysa8DTz1ReJLRc5qjL41U=",
"Exponent": "AQAB",
"InverseQ": "ieZcvSt5XYukKJKhXpv5Dm/1RD7iH88cZnhLSTEVTMoOUHoYWmApY5pNLGahbfjA9bxnkBWDYex/i7wE9uNNY5CsA6ovUaQLVJDt3kHvR9W+9QtN8D6jjG2TuRbbOdEg4RqhfjUaDfDIgTJX2Wxc8U98FOvOyGw1HzwUPFZKecM=",
"Modulus": "vk4z1Bmtmbo+gxITcY+FIlXzcO2wTOGlOXK5GMYj/6PUMFt7lbqkc72AkPsrAo5/JE8LYLhWj7fzSKbjvtowHCz5m2t+FlUYmuiKpvvnJsTqvQrckNlbZ1nm071q5PhP3Dar/OksfBhPtAX+c3+NjDnM/w53ccJJNaBDO/s9JYoN7vH5n6ed1pMSK71hmg4MPsxChcnc1f1PpnG2mqyJ253+GEUbj/kRyeBSmCCr9aadov2ZzxIKVaFNagJEHOzanQmorSLpP25GfOHCuy27Zkef94V/qU9elzjbH4uIKslVGx5T6H99TYh0sUGu11NytYJa5WNAZWow95CzurC2vw==",
"P": "4GMCQy+XTNzR5TsgFcdAZv2K6TcQR13fHVvPoxQp/b32V5YUJOBFEUAtqociy5ro4+KzpXP5WPSk1ZtznGKuNZyLq8gTnhpB3rwd0sdo4zxKnQ5nu+n1UhlhWNxg5A9V5TaciUAyPrHWJfLoYTQWygNTgJELQH5zZXi2ihC2uiU=",
"Q": "2R36pamnLAJggkPJxiW5qH6HizZ+bkQVg0BBftMLzkAM8Y9CwTW75GRUzGEJFpMckkw0GZSYb1Uwl3DVUpkcQ8LZ91IPYdPpDlYUshhIxl184M55pnO14besKxJtMZ64zhHKVAR2pBMO0n6W4/1iBXkkQqyPViJxdfvXPJMBbhM="
}
}
Write Preview
Loading…
Cancel
Save