diff --git a/src/app/pages/accounts/account-details/account-details.component.html b/src/app/pages/accounts/account-details/account-details.component.html index 4378beb..672da8a 100644 --- a/src/app/pages/accounts/account-details/account-details.component.html +++ b/src/app/pages/accounts/account-details/account-details.component.html @@ -382,6 +382,11 @@ search +
+

Loading Transactions!

+ +
+ search +
+

Loading Accounts!

+ +
+ 0) { + this.accountsLoading = false; + } this.cdr.detectChanges(); }); @@ -163,6 +168,9 @@ export class AccountDetailsComponent implements OnInit, AfterViewInit { this.transactionsDataSource.paginator = this.transactionTablePaginator; this.transactionsDataSource.sort = this.transactionTableSort; this.transactions = transactions; + if (transactions.length > 0) { + this.transactionsLoading = false; + } this.cdr.detectChanges(); }); this.userService.getCategories(); diff --git a/src/app/pages/accounts/accounts.component.html b/src/app/pages/accounts/accounts.component.html index 62bc39f..5831b2a 100644 --- a/src/app/pages/accounts/accounts.component.html +++ b/src/app/pages/accounts/accounts.component.html @@ -64,6 +64,11 @@ search +
+

Loading Accounts!

+ +
+ ; tokenSymbol: string; + loading: boolean = true; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -48,6 +49,9 @@ export class AccountsComponent implements OnInit, AfterViewInit { this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; this.accounts = accounts; + if (accounts.length > 0) { + this.loading = false; + } }); try { // TODO it feels like this should be in the onInit handler diff --git a/src/app/pages/accounts/accounts.module.ts b/src/app/pages/accounts/accounts.module.ts index 2d3cf37..fde59b1 100644 --- a/src/app/pages/accounts/accounts.module.ts +++ b/src/app/pages/accounts/accounts.module.ts @@ -23,6 +23,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { ReactiveFormsModule } from '@angular/forms'; import { AccountSearchComponent } from './account-search/account-search.component'; import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @NgModule({ declarations: [ @@ -51,6 +52,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; MatProgressSpinnerModule, ReactiveFormsModule, MatSnackBarModule, + MatProgressBarModule, ], }) export class AccountsModule {} diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index b933f3e..950057d 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -43,6 +43,11 @@ search +
+

Loading Actions!

+ +
+ diff --git a/src/app/pages/admin/admin.component.ts b/src/app/pages/admin/admin.component.ts index 6dcfd5f..c505c80 100644 --- a/src/app/pages/admin/admin.component.ts +++ b/src/app/pages/admin/admin.component.ts @@ -26,6 +26,7 @@ export class AdminComponent implements OnInit { displayedColumns: Array = ['expand', 'user', 'role', 'action', 'status', 'approve']; action: Action; actions: Array; + loading: boolean = true; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -39,6 +40,9 @@ export class AdminComponent implements OnInit { this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; this.actions = actions; + if (actions.length > 0) { + this.loading = false; + } }); } diff --git a/src/app/pages/admin/admin.module.ts b/src/app/pages/admin/admin.module.ts index 7e50ba1..d29f774 100644 --- a/src/app/pages/admin/admin.module.ts +++ b/src/app/pages/admin/admin.module.ts @@ -13,6 +13,7 @@ import { MatSortModule } from '@angular/material/sort'; import { MatPaginatorModule } from '@angular/material/paginator'; import { MatButtonModule } from '@angular/material/button'; import { MatRippleModule } from '@angular/material/core'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @NgModule({ declarations: [AdminComponent], @@ -29,6 +30,7 @@ import { MatRippleModule } from '@angular/material/core'; MatPaginatorModule, MatButtonModule, MatRippleModule, + MatProgressBarModule, ], }) export class AdminModule {} diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index 94ee6c9..02fe0a1 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -22,10 +22,10 @@ const routes: Routes = [ path: 'tokens', loadChildren: () => import('@pages/tokens/tokens.module').then((m) => m.TokensModule), }, - { - path: 'admin', - loadChildren: () => import('@pages/admin/admin.module').then((m) => m.AdminModule), - }, + // { + // path: 'admin', + // loadChildren: () => import('@pages/admin/admin.module').then((m) => m.AdminModule), + // }, { path: '**', redirectTo: 'home', pathMatch: 'full' }, ]; diff --git a/src/app/pages/settings/settings.component.html b/src/app/pages/settings/settings.component.html index 2ed99a0..24fc878 100644 --- a/src/app/pages/settings/settings.component.html +++ b/src/app/pages/settings/settings.component.html @@ -40,6 +40,7 @@ +
@@ -67,6 +68,12 @@ /> search + +
+

Loading Trusted Users!

+ +
+ = ['name', 'email', 'userId']; trustedUsers: Array; userInfo: Staff; + loading: boolean = true; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -29,6 +30,9 @@ export class SettingsComponent implements OnInit { this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; this.trustedUsers = users; + if (users.length > 0) { + this.loading = false; + } }); this.userInfo = this.authService.getPrivateKeyInfo(); } diff --git a/src/app/pages/settings/settings.module.ts b/src/app/pages/settings/settings.module.ts index 139feae..0eb5648 100644 --- a/src/app/pages/settings/settings.module.ts +++ b/src/app/pages/settings/settings.module.ts @@ -18,6 +18,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatSelectModule } from '@angular/material/select'; import { MatMenuModule } from '@angular/material/menu'; import { ReactiveFormsModule } from '@angular/forms'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @NgModule({ declarations: [SettingsComponent, OrganizationComponent], @@ -38,6 +39,7 @@ import { ReactiveFormsModule } from '@angular/forms'; MatSelectModule, MatMenuModule, ReactiveFormsModule, + MatProgressBarModule, ], }) export class SettingsModule {} diff --git a/src/app/pages/tokens/tokens.component.html b/src/app/pages/tokens/tokens.component.html index 56d843b..bebf178 100644 --- a/src/app/pages/tokens/tokens.component.html +++ b/src/app/pages/tokens/tokens.component.html @@ -45,6 +45,11 @@ search +
+

Loading Tokens!

+ +
+ ; token: Token; + loading: boolean = true; constructor(private tokenService: TokenService) {} @@ -39,6 +40,9 @@ export class TokensComponent implements OnInit, AfterViewInit { this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; this.tokens = tokens; + if (tokens.length > 0) { + this.loading = false; + } }); } diff --git a/src/app/pages/tokens/tokens.module.ts b/src/app/pages/tokens/tokens.module.ts index 938d4fb..b3a6332 100644 --- a/src/app/pages/tokens/tokens.module.ts +++ b/src/app/pages/tokens/tokens.module.ts @@ -17,6 +17,7 @@ import { MatSidenavModule } from '@angular/material/sidenav'; import { MatButtonModule } from '@angular/material/button'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatCardModule } from '@angular/material/card'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @NgModule({ declarations: [TokensComponent, TokenDetailsComponent], @@ -37,6 +38,7 @@ import { MatCardModule } from '@angular/material/card'; MatToolbarModule, MatCardModule, MatRippleModule, + MatProgressBarModule, ], }) export class TokensModule {} diff --git a/src/app/pages/transactions/transactions.component.html b/src/app/pages/transactions/transactions.component.html index 96cfcc9..cfceae0 100644 --- a/src/app/pages/transactions/transactions.component.html +++ b/src/app/pages/transactions/transactions.component.html @@ -63,6 +63,11 @@ search +
+

Loading Transactions!

+ +
+
; tokenSymbol: string; + loading: boolean = true; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -47,6 +48,9 @@ export class TransactionsComponent implements OnInit, AfterViewInit { this.transactionDataSource.paginator = this.paginator; this.transactionDataSource.sort = this.sort; this.transactions = transactions; + if (transactions.length > 0) { + this.loading = false; + } }); this.userService .getTransactionTypes() diff --git a/src/app/pages/transactions/transactions.module.ts b/src/app/pages/transactions/transactions.module.ts index 4a5b044..e71342b 100644 --- a/src/app/pages/transactions/transactions.module.ts +++ b/src/app/pages/transactions/transactions.module.ts @@ -17,6 +17,7 @@ import { MatSelectModule } from '@angular/material/select'; import { MatCardModule } from '@angular/material/card'; import { MatRippleModule } from '@angular/material/core'; import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @NgModule({ declarations: [TransactionsComponent, TransactionDetailsComponent], @@ -37,6 +38,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; MatCardModule, MatRippleModule, MatSnackBarModule, + MatProgressBarModule, ], }) export class TransactionsModule {}