Skip to content

Commit

Permalink
fix icon errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@auumgn
auumgn committed Jan 22, 2024
1 parent a938a2c commit 78b1e63
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 41 deletions.
79 changes: 39 additions & 40 deletions ui/src/app/user/users.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.title.string">Manage users</h1>
<div class="row justify-content-end">
<div class="col-md-12 mb-2">
<!-- <button
<button
id="jh-create-entity"
class="btn btn-primary float-right jh-create-entity ml-1"
[routerLink]="['/user/new']"
>
<fa-icon [icon]="'plus'"></fa-icon>
<fa-icon [icon]="faPlus"></fa-icon>
<span i18n="@@gatewayApp.msUserServiceMSUser.home.createLabel.string"> Add user </span>
</button>
<button
Expand All @@ -16,9 +16,9 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
class="btn btn-primary float-right jh-create-entity create-ms-user ml-1"
[routerLink]="['/', 'user', { outlets: { popup: 'import' } }]"
>
<fa-icon [icon]="'plus'"></fa-icon>
<fa-icon [icon]="faPlus"></fa-icon>
<span i18n="@@gatewayApp.msUserServiceMSUser.home.uploadLabel.string"> Import users from CSV </span>
</button> -->
</button>
</div>
</div>
<div class="row">
Expand All @@ -34,28 +34,28 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
ng-model="selected"
class="form-control"
/>
<!-- <button *ngIf="submittedSearchTerm" class="reset" (click)="resetSearch()">
<button *ngIf="submittedSearchTerm" class="reset" (click)="resetSearch()">
<fa-icon aria-hidden="true" [icon]="faTimes" [styles]="{ color: '#2e7f9f' }"></fa-icon>
</button>
</div>
<button class="search" (click)="submitSearch()">
<fa-icon aria-hidden="true" [icon]="faSearch" [styles]="{ color: '#2e7f9f' }"></fa-icon>
</button> -->
</div>
</button>
</div>
</div>
<div class="row">
<div class="col-md-12">
<app-alert></app-alert>
<div class="alert alert-warning" *ngIf="users && users?.length === 0">
<span i18n="@@gatewayApp.msUserServiceMSUser.home.notFound.string">No users to show</span>
</div>
</div>
<div class="row">
<div class="col-md-12">
<app-alert></app-alert>
<div class="alert alert-warning" *ngIf="users && users?.length === 0">
<span i18n="@@gatewayApp.msUserServiceMSUser.home.notFound.string">No users to show</span>
</div>
</div>
<div class="table-responsive" *ngIf="users && users.length && users.length > 0">
<table class="table table-striped">
<thead>
<!-- <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" [callback]="transition.bind(this)">
</div>
<div class="table-responsive" *ngIf="users && users.length && users.length > 0">
<table class="table table-striped">
<thead>
<!-- <tr jhiSort [(predicate)]="predicate" [(ascending)]="reverse" [callback]="transition.bind(this)">
<th></th>
<th jhiSortBy="email"><span i18n="@@gatewayApp.msUserServiceMSUser.email.string">Email</span> <fa-icon [icon]="'sort'.string"></fa-icon></th>
<th jhiSortBy="firstName"><span i18n="@@gatewayApp.msUserServiceMSUser.firstName.string">First Name</span> <fa-icon [icon]="'sort'.string"></fa-icon></th>
Expand All @@ -66,8 +66,8 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
<th jhiSortBy="lastModifiedDate"><span i18n="@@gatewayApp.msUserServiceMSUser.lastModifiedDate.string">Last Modified</span> <fa-icon [icon]="'sort'.string"></fa-icon></th>
<th></th>
</tr> -->
</thead>
<!-- <tbody>
</thead>
<tbody>
<tr *ngFor="let user of users; trackBy: trackId">
<td>
<button
Expand All @@ -78,7 +78,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
class="btn btn-primary btn-sm ml-1"
[disabled]="disableImpersonate(user)"
>
<fa-icon [icon]="'sign-in-alt'"></fa-icon>
<fa-icon [icon]="faSignInAlt"></fa-icon>
</button>
</td>
<td>
Expand Down Expand Up @@ -120,7 +120,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
[styles]="{ color: '#f22112' }"
></fa-icon>
</td>
<td>{{user.lastModifiedDate | date:'medium'}}</td>
<!-- <td>{{user.lastModifiedDate | date:'medium'}}</td> -->
<td class="text-right">
<div class="btn-group">
<button
Expand All @@ -138,7 +138,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
class="btn btn-primary btn-sm ml-1"
[disabled]="isDefaultAdmin(user)"
>
<fa-icon [icon]="'pencil-alt'"></fa-icon>
<fa-icon [icon]="faPencilAlt"></fa-icon>
<span class="d-none d-md-inline" i18n="@@entity.action.edit.string">Edit</span>
</button>
<button
Expand All @@ -149,30 +149,29 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
class="btn btn-danger btn-sm ml-1"
[disabled]="isDefaultAdmin(user) || isUserLoggedIn(user)"
>
<fa-icon [icon]="'times'"></fa-icon>
<fa-icon [icon]="faTimes"></fa-icon>
<span class="d-none d-md-inline" i18n="@@entity.action.delete.string">Delete</span>
</button>
</div>
</td>
</tr>
</tbody> -->
</table>
</tbody>
</table>
</div>
<div [hidden]="users?.length === 0">
<div class="row justify-content-center">
<p>{{ itemCount }}</p>
</div>
<div [hidden]="users?.length === 0">
<div class="row justify-content-center">
<p>{{ itemCount }}</p>
</div>
<div class="row justify-content-center">
<ngb-pagination
[collectionSize]="totalItems"
[(page)]="page"
[pageSize]="itemsPerPage"
[maxSize]="5"
[rotate]="true"
[boundaryLinks]="true"
(pageChange)="loadPage(page)"
></ngb-pagination>
</div>
<div class="row justify-content-center">
<ngb-pagination
[collectionSize]="totalItems"
[(page)]="page"
[pageSize]="itemsPerPage"
[maxSize]="5"
[rotate]="true"
[boundaryLinks]="true"
(pageChange)="loadPage(page)"
></ngb-pagination>
</div>
</div>
</div>
13 changes: 12 additions & 1 deletion ui/src/app/user/users.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ import { Subscription, filter } from 'rxjs'
import { UserService } from './service/user.service'
import { HttpErrorResponse } from '@angular/common/http'
import { IUserPage, UserPage } from './model/user-page.model'
import { faCheckCircle, faSearch, faTimes, faTimesCircle } from '@fortawesome/free-solid-svg-icons'
import {
faCheckCircle,
faPencilAlt,
faPlus,
faSearch,
faSignInAlt,
faTimes,
faTimesCircle,
} from '@fortawesome/free-solid-svg-icons'
import { AlertType, EventType, ITEMS_PER_PAGE } from '../app.constants'
import { ActivatedRoute, Router } from '@angular/router'
import { AccountService } from '../account/service/account.service'
Expand Down Expand Up @@ -38,6 +46,9 @@ export class UsersComponent implements OnInit, OnDestroy {
faCheckCircle = faCheckCircle
faTimes = faTimes
faSearch = faSearch
faPlus = faPlus
faPencilAlt = faPencilAlt
faSignInAlt = faSignInAlt

DEFAULT_ADMIN = '[email protected]'

Expand Down

0 comments on commit 78b1e63

Please sign in to comment.