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 @@
+