Skip to content

Commit 6bc3b20

Browse files
FxdonadFxdonad
committed
fix warning
1 parent 0f8810e commit 6bc3b20

File tree

4 files changed

+74
-107
lines changed

4 files changed

+74
-107
lines changed

‎src/app/features/excercise/exercise-pages/list-exercise/list-exercise.component.html‎

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[isSearchable]="true"
3434
[minHeight]="true"
3535
[needIndexColor]="true"
36-
>
36+
>
3737
</app-dropdown-button>
3838
</div>
3939
<div class="dropdown-filter">
@@ -55,64 +55,44 @@
5555
[isSearchable]="false"
5656
[minHeight]="true"
5757
[needIndexColor]="true"
58-
>
58+
>
5959
</app-dropdown-button>
6060
</div>
6161

6262
@if (isActionActive) {
63-
<div class="create-exercise-btn">
64-
<app-btn-type1
65-
thumb="+"
66-
[thumbSize]="24"
67-
description="Tạo thủ công"
68-
(click)="toggleOpenModalCreate()"
69-
></app-btn-type1>
70-
<app-btn-type1
71-
thumb="AI +"
72-
[thumbSize]="16"
73-
description="Tạo bằng AI"
74-
(click)="toggleOpenModalGenerate()"
75-
></app-btn-type1>
76-
</div>
63+
<div class="create-exercise-btn">
64+
<app-btn-type1
65+
thumb="+"
66+
[thumbSize]="24"
67+
description="Tạo thủ công"
68+
(click)="toggleOpenModalCreate()"
69+
></app-btn-type1>
70+
<app-btn-type1
71+
thumb="AI +"
72+
[thumbSize]="16"
73+
description="Tạo bằng AI"
74+
(click)="toggleOpenModalGenerate()"
75+
></app-btn-type1>
76+
</div>
7777
}
7878
</div>
7979
@if (listExercise && !isLoading) {
80-
<div
81-
class="list-exercise"
82-
appScrollEnd
83-
(appScrollEnd)="loadNextPage()"
84-
>
85-
@for (item of listExercise; track item) {
86-
<app-card-excercise
87-
[data]="item"
88-
[exerciseId]="item.id"
89-
>
90-
</app-card-excercise>
91-
}
92-
</div>
93-
}
94-
95-
@if (isLoading) {
96-
<app-skeleton-loading
97-
type="card"
98-
[count]="8"
99-
></app-skeleton-loading>
100-
}
101-
102-
@if (listExercise.length === 0 && !isLoading) {
103-
<div
104-
class="no-data-container"
105-
>
106-
<ng-lottie [options]="lottieOptions" style="width: 200px; height: 200px">
107-
</ng-lottie>
108-
<p>Không có dữ liệu</p>
109-
</div>
110-
}
111-
112-
@if (isLoadingMore) {
113-
<div class="loading-more">
114-
Đang tải thêm, xin chờ...
115-
</div>
80+
<div class="list-exercise" appScrollEnd (appScrollEnd)="loadNextPage()">
81+
@for (item of listExercise; track item.id) {
82+
<app-card-excercise [data]="item" [exerciseId]="item.id">
83+
</app-card-excercise>
84+
}
85+
</div>
86+
} @if (isLoading) {
87+
<app-skeleton-loading type="card" [count]="8"></app-skeleton-loading>
88+
} @if (listExercise.length === 0 && !isLoading) {
89+
<div class="no-data-container">
90+
<ng-lottie [options]="lottieOptions" style="width: 200px; height: 200px">
91+
</ng-lottie>
92+
<p>Không có dữ liệu</p>
93+
</div>
94+
} @if (isLoadingMore) {
95+
<div class="loading-more">Đang tải thêm, xin chờ...</div>
11696
}
11797
</div>
11898
</div>

‎src/app/shared/components/fxdonad-shared/skeleton-loading/skeleton-loading.component.html‎

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,33 @@
11
@if (type === 'card') {
2-
<div class="skeleton-list-grid">
3-
@for (i of [].constructor(count); track i) {
4-
<div
5-
class="skeleton-card skeleton-animate"
6-
>
7-
<div class="skeleton-card-thumb"></div>
8-
<div class="skeleton-card-content">
9-
<div class="skeleton-line skeleton-title"></div>
10-
<div class="skeleton-line skeleton-subtitle"></div>
11-
<div class="skeleton-line skeleton-text"></div>
12-
<div class="skeleton-line skeleton-text short"></div>
13-
</div>
14-
</div>
15-
}
16-
</div>
17-
}
18-
@if (type === 'list') {
19-
@for (i of [].constructor(count); track i) {
20-
<div
21-
class="skeleton-list skeleton-animate"
22-
>
23-
<div class="skeleton-list-avatar"></div>
24-
<div class="skeleton-list-lines">
25-
<div class="skeleton-line skeleton-title"></div>
26-
<div class="skeleton-line skeleton-text short"></div>
27-
</div>
28-
</div>
29-
}
30-
}
31-
@if (type === 'post') {
32-
@for (i of [].constructor(count); track i) {
33-
<div
34-
class="skeleton-post skeleton-animate"
35-
>
36-
<div class="skeleton-post-header">
37-
<div class="skeleton-post-avatar"></div>
38-
<div class="skeleton-line skeleton-title"></div>
39-
</div>
40-
<div class="skeleton-line skeleton-text"></div>
2+
<div class="skeleton-list-grid">
3+
@for (i of skeletonArray; track i) {
4+
<div class="skeleton-card skeleton-animate">
5+
<div class="skeleton-card-thumb"></div>
6+
<div class="skeleton-card-content">
7+
<div class="skeleton-line skeleton-title"></div>
8+
<div class="skeleton-line skeleton-subtitle"></div>
419
<div class="skeleton-line skeleton-text"></div>
4210
<div class="skeleton-line skeleton-text short"></div>
4311
</div>
12+
</div>
4413
}
45-
}
14+
</div>
15+
} @if (type === 'list') { @for (i of skeletonArray; track i) {
16+
<div class="skeleton-list skeleton-animate">
17+
<div class="skeleton-list-avatar"></div>
18+
<div class="skeleton-list-lines">
19+
<div class="skeleton-line skeleton-title"></div>
20+
<div class="skeleton-line skeleton-text short"></div>
21+
</div>
22+
</div>
23+
} } @if (type === 'post') { @for (i of skeletonArray; track i) {
24+
<div class="skeleton-post skeleton-animate">
25+
<div class="skeleton-post-header">
26+
<div class="skeleton-post-avatar"></div>
27+
<div class="skeleton-line skeleton-title"></div>
28+
</div>
29+
<div class="skeleton-line skeleton-text"></div>
30+
<div class="skeleton-line skeleton-text"></div>
31+
<div class="skeleton-line skeleton-text short"></div>
32+
</div>
33+
} }

‎src/app/shared/components/fxdonad-shared/skeleton-loading/skeleton-loading.component.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, Input } from '@angular/core';
22

3-
43
@Component({
54
selector: 'app-skeleton-loading',
65
standalone: true,
@@ -11,4 +10,8 @@ import { Component, Input } from '@angular/core';
1110
export class SkeletonLoadingComponent {
1211
@Input() type: 'card' | 'list' | 'post' = 'card';
1312
@Input() count: number = 1;
13+
14+
get skeletonArray() {
15+
return Array.from({ length: this.count }, (_, i) => i);
16+
}
1417
}

‎src/app/shared/components/my-shared/breadcum/breadcrumb/breadcrumb.component.html‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
<nav aria-label="breadcrumb">
22
<ol class="breadcrumb">
3-
@for (breadcrumb of breadcrumbs; track breadcrumb; let last = $last) {
4-
<li
5-
class="breadcrumb-item"
6-
>
7-
<!-- <a *ngIf="!breadcrumb.isActive" [routerLink]="breadcrumb.url">{{
3+
@for (breadcrumb of breadcrumbs; track breadcrumb.url; let last = $last) {
4+
<li class="breadcrumb-item">
5+
<!-- <a *ngIf="!breadcrumb.isActive" [routerLink]="breadcrumb.url">{{
86
breadcrumb.label
97
}}</a> -->
108
@if (!breadcrumb.isActive) {
11-
<span>{{ breadcrumb.label }}</span>
12-
}
13-
@if (breadcrumb.isActive) {
14-
<span>{{ breadcrumb.label }}</span>
15-
}
16-
@if (!last) {
17-
<span class="breadcrumb-separator">/</span>
9+
<span>{{ breadcrumb.label }}</span>
10+
} @if (breadcrumb.isActive) {
11+
<span>{{ breadcrumb.label }}</span>
12+
} @if (!last) {
13+
<span class="breadcrumb-separator">/</span>
1814
}
1915
</li>
20-
}
21-
</ol>
16+
}
17+
</ol>
2218
</nav>

0 commit comments

Comments
 (0)