Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "500kB",
"maximumError": "1MB"
"maximumWarning": "1000kB",
"maximumError": "5MB"
},
{
"type": "anyComponentStyle",
"maximumWarning": "4kB",
"maximumError": "8kB"
"maximumWarning": "400kB",
"maximumError": "800kB"
}
],
"outputHashing": "all"
Expand Down
6 changes: 6 additions & 0 deletions src/app/core/services/api-service/organization.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,10 @@ export class OrganizationService {
data
);
}

removeMemberFromBlock(blockId: string, memberId: string) {
return this.api.delete<ApiResponse<null>>(
API_CONFIG.ENDPOINTS.DELETE.REMOVE_MEMBER_FROM_BLOCK(blockId, memberId)
);
}
}
2 changes: 2 additions & 0 deletions src/app/core/services/config-service/api.enpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ export const API_CONFIG = {
`/profile/exercise/${exerciseId}/save`,
DELETE_ORG: (orgId: string) => `/org/organization/${orgId}`,
DELETE_BLOCK: (blockId: string) => `/org/block/${blockId}`,
REMOVE_MEMBER_FROM_BLOCK: (blockId: string, memberId: string) =>
`/org/block/${blockId}/member/${memberId}`,
},
},
HEADERS: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="exercise-main-container">
<div class="main-content">
<app-breadcrumb></app-breadcrumb>
<!-- <app-breadcrumb></app-breadcrumb> -->
<div class="filter-container">
<app-input
label=""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.exercise-main-container {
display: flex;
width: 100%;
height: calc(100vh - 130px);
height: calc(100vh - 150px);
overflow: hidden;
padding-top: 12px;

.main-content {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
clearLoading,
setLoading,
} from '../../../../shared/store/loading-state/loading.action';
import { decodeJWT } from '../../../../shared/utils/stringProcess';
import { ScrollEndDirective } from '../../../../shared/directives/scroll-end.directive';
import { BtnType1Component } from '../../../../shared/components/fxdonad-shared/ui-verser-io/btn-type1/btn-type1.component';
import { GenerateExerciseModalComponent } from '../../exercise-modal/generate-exercise/generate-exercise.component';
Expand All @@ -36,7 +35,6 @@ import { activeForAdminAndTeacher } from '../../../../shared/utils/authenRoleAct
selector: 'app-list-exercise',
imports: [
CommonModule,
BreadcrumbComponent,
CardExcerciseComponent,
InputComponent,
DropdownButtonComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,69 @@
<div class="modal-wrapper" [class.show]="isOpen">
<div class="modal-content" (click)="$event.stopPropagation()">
<header class="modal-header">
<h2>Thêm người dùng vào Block</h2>
<button class="close-btn" (click)="close()">&times;</button>
<h2 class="modal-title">Thêm người dùng vào Block</h2>
<button class="close-btn" (click)="close()">
<i class="fas fa-times"></i>
</button>
</header>

<!-- Search box -->
<div class="search-box">
<input
type="text"
[(ngModel)]="searchQuery"
(ngModelChange)="onSearchChange($event)"
placeholder="Tìm kiếm tên hoặc email..."
/>
</div>

<!-- Search results -->
<div class="results">
<div
class="user-item"
*ngFor="let user of searchResults"
(click)="addUser(user)"
>
<img
[src]="user.avatarUrl || '/assets/avatar-default.png'"
alt="avatar"
<div class="modal-body">
<div class="search-box">
<input
type="text"
[(ngModel)]="searchQuery"
(ngModelChange)="onSearchChange($event)"
placeholder="Tìm kiếm tên hoặc email..."
/>
<div>
<strong>{{ user.displayName }}</strong>
<span>{{ user.email }}</span>
<i class="fas fa-search search-icon"></i>
</div>

<div class="selected-users-section" *ngIf="selectedUsers.length">
<h3>Đã chọn ({{ selectedUsers.length }})</h3>
<div class="chips-container">
<div class="chip" *ngFor="let u of selectedUsers">
{{ u.userId }}
<button class="remove-chip-btn" (click)="removeUser(u.userId)">
<i class="fas fa-times"></i>
</button>
</div>
</div>
</div>
<p *ngIf="!searchResults.length && searchQuery">
Không tìm thấy kết quả.
</p>
</div>

<!-- Selected users -->
<div class="selected">
<h3>Đã chọn</h3>
<div class="chip" *ngFor="let u of selectedUsers">
{{ u.userId }}
<button (click)="removeUser(u.userId)">×</button>
<div class="search-results-section">
<div class="results-list">
<div
class="user-item"
*ngFor="let user of searchResults"
(click)="addUser(user)"
>
<img
[src]="user.avatarUrl || '/assets/avatar-default.png'"
alt="avatar"
class="user-avatar"
/>
<div class="user-info">
<span class="user-name">{{ user.displayName }}</span>
<span class="user-email">{{ user.email }}</span>
</div>
</div>
<p
*ngIf="!searchResults.length && searchQuery"
class="no-results-text"
>
Không tìm thấy kết quả.
</p>
</div>
</div>
</div>

<!-- Actions -->
<footer class="modal-footer">
<button class="btn-cancel" (click)="close()">Hủy</button>
<button class="btn-save" [disabled]="submitting" (click)="submit()">
<button class="btn btn-cancel" (click)="close()">Hủy</button>
<button
class="btn btn-save"
[disabled]="submitting || !selectedUsers.length"
(click)="submit()"
>
{{ submitting ? "Đang lưu..." : "Xác nhận thêm" }}
</button>
</footer>
Expand Down
Loading
Loading