diff --git a/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts index 7326d6096..f46ca0ed0 100644 --- a/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts +++ b/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts @@ -7,9 +7,9 @@ import { OnInit, ViewChild } from '@angular/core'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; import { getCssVariable, getTextColor } from '@ghostfolio/helper/helper'; +import { PortfolioPosition } from '@ghostfolio/helper/interfaces'; import { Currency } from '@prisma/client'; import { Tooltip } from 'chart.js'; import { LinearScale } from 'chart.js'; diff --git a/apps/client/src/app/components/position/position.component.ts b/apps/client/src/app/components/position/position.component.ts index 47bca6504..7c14a73af 100644 --- a/apps/client/src/app/components/position/position.component.ts +++ b/apps/client/src/app/components/position/position.component.ts @@ -7,8 +7,8 @@ import { } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; +import { PortfolioPosition } from '@ghostfolio/helper/interfaces'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/positions-table/positions-table.component.ts b/apps/client/src/app/components/positions-table/positions-table.component.ts index abc90c8d7..12655b396 100644 --- a/apps/client/src/app/components/positions-table/positions-table.component.ts +++ b/apps/client/src/app/components/positions-table/positions-table.component.ts @@ -13,7 +13,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute, Router } from '@angular/router'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; +import { PortfolioPosition } from '@ghostfolio/helper/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/positions/positions.component.ts b/apps/client/src/app/components/positions/positions.component.ts index 5f69736e0..8bcc8addd 100644 --- a/apps/client/src/app/components/positions/positions.component.ts +++ b/apps/client/src/app/components/positions/positions.component.ts @@ -5,8 +5,8 @@ import { OnChanges, OnInit } from '@angular/core'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces'; +import { PortfolioPosition } from '@ghostfolio/helper/interfaces/portfolio-position.interface'; @Component({ selector: 'gf-positions', diff --git a/apps/client/src/app/pages/analysis/analysis-page.component.ts b/apps/client/src/app/pages/analysis/analysis-page.component.ts index 420f2a7d2..2971b1ba0 100644 --- a/apps/client/src/app/pages/analysis/analysis-page.component.ts +++ b/apps/client/src/app/pages/analysis/analysis-page.component.ts @@ -1,11 +1,13 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type'; import { DataService } from '@ghostfolio/client/services/data.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { PortfolioItem } from '@ghostfolio/helper/interfaces'; +import { + PortfolioItem, + PortfolioPosition +} from '@ghostfolio/helper/interfaces'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts index cd1f9e031..b347a0ca5 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -2,7 +2,6 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { DateRange } from '@ghostfolio/api/app/portfolio/interfaces/date-range.type'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface'; import { PerformanceChartDialog } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.component'; @@ -14,8 +13,11 @@ import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { PortfolioPerformance } from '@ghostfolio/helper/interfaces'; -import { PortfolioOverview } from '@ghostfolio/helper/interfaces'; +import { + PortfolioOverview, + PortfolioPerformance, + PortfolioPosition +} from '@ghostfolio/helper/interfaces'; import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index 7425aa8af..43c7a5114 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -1,3 +1,5 @@ +import {} from '@ghostfolio/helper/interfaces'; + import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto'; @@ -9,18 +11,20 @@ import { HistoricalDataItem, PortfolioPositionDetail } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface'; -import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { PortfolioReport } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-report.interface'; import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.interface'; import { UserItem } from '@ghostfolio/api/app/user/interfaces/user-item.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { UpdateUserSettingsDto } from '@ghostfolio/api/app/user/update-user-settings.dto'; -import { PortfolioPerformance } from '@ghostfolio/helper/interfaces'; -import { InfoItem } from '@ghostfolio/helper/interfaces'; -import { PortfolioItem } from '@ghostfolio/helper/interfaces'; -import { PortfolioOverview } from '@ghostfolio/helper/interfaces'; -import { Access } from '@ghostfolio/helper/interfaces'; +import { + Access, + InfoItem, + PortfolioItem, + PortfolioOverview, + PortfolioPerformance, + PortfolioPosition +} from '@ghostfolio/helper/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Account as AccountModel } from '@prisma/client'; import { parseISO } from 'date-fns'; diff --git a/libs/helper/src/lib/interfaces/index.ts b/libs/helper/src/lib/interfaces/index.ts index 61f40181c..d31caec84 100644 --- a/libs/helper/src/lib/interfaces/index.ts +++ b/libs/helper/src/lib/interfaces/index.ts @@ -3,6 +3,7 @@ import { InfoItem } from './info-item.interface'; import { PortfolioItem } from './portfolio-item.interface'; import { PortfolioOverview } from './portfolio-overview.interface'; import { PortfolioPerformance } from './portfolio-performance.interface'; +import { PortfolioPosition } from './portfolio-position.interface'; import { Position } from './position.interface'; export { @@ -11,5 +12,6 @@ export { PortfolioItem, PortfolioOverview, PortfolioPerformance, + PortfolioPosition, Position }; diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-position.interface.ts b/libs/helper/src/lib/interfaces/portfolio-position.interface.ts similarity index 100% rename from apps/api/src/app/portfolio/interfaces/portfolio-position.interface.ts rename to libs/helper/src/lib/interfaces/portfolio-position.interface.ts