diff --git a/apps/client/src/app/components/accounts-table/accounts-table.module.ts b/apps/client/src/app/components/accounts-table/accounts-table.module.ts index 215bfd405..edbdee3ea 100644 --- a/apps/client/src/app/components/accounts-table/accounts-table.module.ts +++ b/apps/client/src/app/components/accounts-table/accounts-table.module.ts @@ -5,10 +5,10 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTableModule } from '@angular/material/table'; import { RouterModule } from '@angular/router'; +import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module'; import { GfValueModule } from '@ghostfolio/ui/value'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; import { AccountsTableComponent } from './accounts-table.component'; @NgModule({ diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html index bbf31bf77..18a46fecd 100644 --- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html +++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -125,7 +125,7 @@ - + >

Transactions

- + >
diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts index f4194fbc3..e71d3067a 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts +++ b/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts @@ -3,8 +3,8 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { RouterModule } from '@angular/router'; -import { GfTransactionsTableModule } from '@ghostfolio/client/components/transactions-table/transactions-table.module'; import { ImportTransactionsService } from '@ghostfolio/client/services/import-transactions.service'; +import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module'; import { GfCreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module'; import { GfImportTransactionDialogModule } from './import-transaction-dialog/import-transaction-dialog.module'; @@ -16,9 +16,9 @@ import { TransactionsPageComponent } from './transactions-page.component'; exports: [], imports: [ CommonModule, + GfActivitiesTableModule, GfCreateOrUpdateTransactionDialogModule, GfImportTransactionDialogModule, - GfTransactionsTableModule, MatButtonModule, MatSnackBarModule, RouterModule, diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html similarity index 100% rename from apps/client/src/app/components/transactions-table/transactions-table.component.html rename to libs/ui/src/lib/activities-table/activities-table.component.html diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.scss b/libs/ui/src/lib/activities-table/activities-table.component.scss similarity index 100% rename from apps/client/src/app/components/transactions-table/transactions-table.component.scss rename to libs/ui/src/lib/activities-table/activities-table.component.scss diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts similarity index 96% rename from apps/client/src/app/components/transactions-table/transactions-table.component.ts rename to libs/ui/src/lib/activities-table/activities-table.component.ts index e22a0bcb7..8df76d9d2 100644 --- a/apps/client/src/app/components/transactions-table/transactions-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -30,14 +30,12 @@ const SEARCH_PLACEHOLDER = 'Search for account, currency, symbol or type...'; const SEARCH_STRING_SEPARATOR = ','; @Component({ - selector: 'gf-transactions-table', changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './transactions-table.component.html', - styleUrls: ['./transactions-table.component.scss'] + selector: 'gf-activities-table', + styleUrls: ['./activities-table.component.scss'], + templateUrl: './activities-table.component.html' }) -export class TransactionsTableComponent - implements OnChanges, OnDestroy, OnInit -{ +export class ActivitiesTableComponent implements OnChanges, OnDestroy { @Input() baseCurrency: string; @Input() deviceType: string; @Input() hasPermissionToCreateOrder: boolean; @@ -124,8 +122,6 @@ export class TransactionsTableComponent this.searchControl.setValue(null); } - public ngOnInit() {} - public ngOnChanges() { this.displayedColumns = [ 'count', diff --git a/apps/client/src/app/components/transactions-table/transactions-table.module.ts b/libs/ui/src/lib/activities-table/activities-table.module.ts similarity index 81% rename from apps/client/src/app/components/transactions-table/transactions-table.module.ts rename to libs/ui/src/lib/activities-table/activities-table.module.ts index 862928127..56947d7e9 100644 --- a/apps/client/src/app/components/transactions-table/transactions-table.module.ts +++ b/libs/ui/src/lib/activities-table/activities-table.module.ts @@ -9,17 +9,17 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatSortModule } from '@angular/material/sort'; import { MatTableModule } from '@angular/material/table'; import { RouterModule } from '@angular/router'; +import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; import { GfNoTransactionsInfoModule } from '@ghostfolio/ui/no-transactions-info'; import { GfValueModule } from '@ghostfolio/ui/value'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; -import { TransactionsTableComponent } from './transactions-table.component'; +import { ActivitiesTableComponent } from './activities-table.component'; @NgModule({ - declarations: [TransactionsTableComponent], - exports: [TransactionsTableComponent], + declarations: [ActivitiesTableComponent], + exports: [ActivitiesTableComponent], imports: [ CommonModule, GfNoTransactionsInfoModule, @@ -37,7 +37,6 @@ import { TransactionsTableComponent } from './transactions-table.component'; ReactiveFormsModule, RouterModule ], - providers: [], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class GfTransactionsTableModule {} +export class GfActivitiesTableModule {}