Skip to content

Commit bdd621b

Browse files
authored
Merge pull request #24579 from abpframework/issue-24564
Angular - Applying the latest migrations - Issue 24564
2 parents 7673092 + 7a64085 commit bdd621b

File tree

36 files changed

+499
-768
lines changed

36 files changed

+499
-768
lines changed

npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.html

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,47 @@
55
<div class="col-12 col-md-3">
66
<ul class="nav flex-column nav-pills" id="nav-tab" role="tablist">
77
@if (!hideChangePasswordTab && (profile$ | async)) {
8-
<li class="nav-item" (click)="selectedTab = 0">
9-
<a
10-
class="nav-link"
11-
[ngClass]="{ active: selectedTab === 0 }"
12-
role="tab"
13-
href="javascript:void(0)"
14-
>{{ 'AbpUi::ChangePassword' | abpLocalization }}</a
15-
>
16-
</li>
8+
<li class="nav-item" (click)="selectedTab = 0">
9+
<a class="nav-link" [class.active]="selectedTab === 0" role="tab" href="javascript:void(0)">{{
10+
'AbpUi::ChangePassword' | abpLocalization }}</a>
11+
</li>
1712
}
1813
<li class="nav-item mb-2" (click)="selectedTab = 1">
19-
<a
20-
class="nav-link"
21-
[ngClass]="{ active: selectedTab === 1 }"
22-
role="tab"
23-
href="javascript:void(0)"
24-
>{{ 'AbpAccount::PersonalSettings' | abpLocalization }}</a
25-
>
14+
<a class="nav-link" [class.active]="selectedTab === 1" role="tab" href="javascript:void(0)">{{
15+
'AbpAccount::PersonalSettings' | abpLocalization }}</a>
2616
</li>
2717
</ul>
2818
</div>
2919
@if (profile$ | async) {
30-
<div class="col-12 col-md-9">
31-
@if (selectedTab === 0) {
32-
<div class="tab-content" [@fadeIn]>
33-
<div class="tab-pane active" role="tabpanel">
34-
<h4>
35-
{{ 'AbpIdentity::ChangePassword' | abpLocalization }}
36-
<hr />
37-
</h4>
38-
<abp-change-password-form
39-
*abpReplaceableTemplate="{
20+
<div class="col-12 col-md-9">
21+
@if (selectedTab === 0) {
22+
<div class="tab-content fade-in">
23+
<div class="tab-pane active" role="tabpanel">
24+
<h4>
25+
{{ 'AbpIdentity::ChangePassword' | abpLocalization }}
26+
<hr />
27+
</h4>
28+
<abp-change-password-form *abpReplaceableTemplate="{
4029
componentKey: changePasswordKey
41-
}"
42-
></abp-change-password-form>
43-
</div>
44-
</div>
45-
}
46-
@if (selectedTab === 1) {
47-
<div class="tab-content" [@fadeIn]>
48-
<div class="tab-pane active" role="tabpanel">
49-
<h4>
50-
{{ 'AbpIdentity::PersonalSettings' | abpLocalization }}
51-
<hr />
52-
</h4>
53-
<abp-personal-settings-form
54-
*abpReplaceableTemplate="{
30+
}"></abp-change-password-form>
31+
</div>
32+
</div>
33+
}
34+
@if (selectedTab === 1) {
35+
<div class="tab-content fade-in">
36+
<div class="tab-pane active" role="tabpanel">
37+
<h4>
38+
{{ 'AbpIdentity::PersonalSettings' | abpLocalization }}
39+
<hr />
40+
</h4>
41+
<abp-personal-settings-form *abpReplaceableTemplate="{
5542
componentKey: personalSettingsKey
56-
}"
57-
></abp-personal-settings-form>
58-
</div>
59-
</div>
60-
}
43+
}"></abp-personal-settings-form>
44+
</div>
6145
</div>
46+
}
47+
</div>
6248
}
6349
</div>
6450
</div>
65-
</div>
51+
</div>

npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { ProfileService } from '@abp/ng.account.core/proxy';
2-
import { fadeIn, LoadingDirective } from '@abp/ng.theme.shared';
3-
import { transition, trigger, useAnimation } from '@angular/animations';
2+
import { LoadingDirective } from '@abp/ng.theme.shared';
43
import { Component, inject, OnInit } from '@angular/core';
54
import { eAccountComponents } from '../../enums/components';
65
import { ManageProfileStateService } from '../../services/manage-profile.state.service';
7-
import { NgClass, AsyncPipe } from '@angular/common';
6+
import { AsyncPipe } from '@angular/common';
87
import { ReactiveFormsModule } from '@angular/forms';
98
import { LocalizationPipe, ReplaceableTemplateDirective } from '@abp/ng.core';
109
import { PersonalSettingsComponent } from '../personal-settings/personal-settings.component';
@@ -13,24 +12,34 @@ import { ChangePasswordComponent } from '../change-password/change-password.comp
1312
@Component({
1413
selector: 'abp-manage-profile',
1514
templateUrl: './manage-profile.component.html',
16-
animations: [trigger('fadeIn', [transition(':enter', useAnimation(fadeIn))])],
1715
styles: [
18-
//TODO: move static styles
1916
`
2017
.min-h-400 {
2118
min-height: 400px;
2219
}
20+
21+
.fade-in {
22+
animation: fadeIn 350ms ease both;
23+
}
24+
25+
@keyframes fadeIn {
26+
from {
27+
opacity: 0;
28+
}
29+
to {
30+
opacity: 1;
31+
}
32+
}
2333
`,
2434
],
2535
imports: [
26-
NgClass,
2736
AsyncPipe,
2837
ReactiveFormsModule,
2938
PersonalSettingsComponent,
3039
ChangePasswordComponent,
3140
LocalizationPipe,
3241
ReplaceableTemplateDirective,
33-
LoadingDirective,
42+
LoadingDirective
3443
],
3544
})
3645
export class ManageProfileComponent implements OnInit {

0 commit comments

Comments
 (0)