diff --git a/apps/api/src/app/info/info.controller.ts b/apps/api/src/app/info/info.controller.ts index b42bff063..984136bdd 100644 --- a/apps/api/src/app/info/info.controller.ts +++ b/apps/api/src/app/info/info.controller.ts @@ -1,7 +1,7 @@ +import { InfoItem } from '@ghostfolio/helper/interfaces'; import { Controller, Get } from '@nestjs/common'; import { InfoService } from './info.service'; -import { InfoItem } from './interfaces/info-item.interface'; @Controller('info') export class InfoController { diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts index f3e19c81f..e4a204d41 100644 --- a/apps/api/src/app/info/info.service.ts +++ b/apps/api/src/app/info/info.service.ts @@ -1,12 +1,11 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { PrismaService } from '@ghostfolio/api/services/prisma.service'; +import { InfoItem } from '@ghostfolio/helper/interfaces'; import { permissions } from '@ghostfolio/helper/permissions'; import { Injectable } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; import { Currency } from '@prisma/client'; -import { InfoItem } from './interfaces/info-item.interface'; - @Injectable() export class InfoService { private static DEMO_USER_ID = '9b112b4d-3b7d-4bad-9bdd-3b0f7b4dac2f'; diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index 782c64309..6d3365071 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -6,9 +6,9 @@ import { OnInit } from '@angular/core'; import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router'; -import { InfoItem } from '@ghostfolio/api/app/info/interfaces/info-item.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { primaryColorHex, secondaryColorHex } from '@ghostfolio/helper/config'; +import { InfoItem } from '@ghostfolio/helper/interfaces'; import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { MaterialCssVarsService } from 'angular-material-css-vars'; import { Subject } from 'rxjs'; diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts index ea1cf4889..32555f39a 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -6,12 +6,12 @@ import { } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; -import { InfoItem } from '@ghostfolio/api/app/info/interfaces/info-item.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { LoginWithAccessTokenDialog } from '@ghostfolio/client/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component'; 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 { InfoItem } from '@ghostfolio/helper/interfaces'; import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { EMPTY, Subject } from 'rxjs'; import { catchError, takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index ac7317445..350660f9a 100644 --- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts +++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts @@ -9,8 +9,8 @@ import { OnInit, ViewChild } from '@angular/core'; -import { PortfolioItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; import { primaryColorRgb } from '@ghostfolio/helper/config'; +import { PortfolioItem } from '@ghostfolio/helper/interfaces'; import { LineController, LineElement, diff --git a/apps/client/src/app/components/portfolio-overview/portfolio-overview.component.ts b/apps/client/src/app/components/portfolio-overview/portfolio-overview.component.ts index 93086fdf9..d8f34c84e 100644 --- a/apps/client/src/app/components/portfolio-overview/portfolio-overview.component.ts +++ b/apps/client/src/app/components/portfolio-overview/portfolio-overview.component.ts @@ -5,7 +5,7 @@ import { OnChanges, OnInit } from '@angular/core'; -import { PortfolioOverview } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-overview.interface'; +import { PortfolioOverview } from '@ghostfolio/helper/interfaces'; import { Currency } from '@prisma/client'; @Component({ diff --git a/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts b/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts index 5c2497c14..8777f9410 100644 --- a/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts +++ b/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts @@ -7,7 +7,7 @@ import { OnChanges, OnInit } from '@angular/core'; -import { PortfolioItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; +import { PortfolioItem } from '@ghostfolio/helper/interfaces'; import { endOfDay, parseISO, startOfDay } from 'date-fns'; @Component({ 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 e8b7498b0..420f2a7d2 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,11 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { PortfolioItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; 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 { 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 43b3e8e16..d070e1ea2 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 { PortfolioOverview } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-overview.interface'; import { PortfolioPerformance } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-performance.interface'; import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; @@ -16,6 +15,7 @@ import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; +import { PortfolioOverview } 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 25bf006f4..1b0b8bab2 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -3,11 +3,8 @@ import { Injectable } from '@angular/core'; import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto'; import { UpdateAccountDto } from '@ghostfolio/api/app/account/update-account.dto'; import { AdminData } from '@ghostfolio/api/app/admin/interfaces/admin-data.interface'; -import { InfoItem } from '@ghostfolio/api/app/info/interfaces/info-item.interface'; import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto'; import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto'; -import { PortfolioItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; -import { PortfolioOverview } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-overview.interface'; import { PortfolioPerformance } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-performance.interface'; import { HistoricalDataItem, @@ -20,6 +17,9 @@ import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.in 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 { InfoItem } from '@ghostfolio/helper/interfaces'; +import { PortfolioItem } from '@ghostfolio/helper/interfaces'; +import { PortfolioOverview } from '@ghostfolio/helper/interfaces'; import { Access } from '@ghostfolio/helper/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Account as AccountModel } from '@prisma/client'; diff --git a/libs/helper/src/lib/interfaces/index.ts b/libs/helper/src/lib/interfaces/index.ts index a39c7aaa7..bba58b117 100644 --- a/libs/helper/src/lib/interfaces/index.ts +++ b/libs/helper/src/lib/interfaces/index.ts @@ -1,3 +1,6 @@ import { Access } from './access.interface'; +import { InfoItem } from './info-item.interface'; +import { PortfolioItem } from './portfolio-item.interface'; +import { PortfolioOverview } from './portfolio-overview.interface'; -export { Access }; +export { Access, InfoItem, PortfolioItem, PortfolioOverview }; diff --git a/apps/api/src/app/info/interfaces/info-item.interface.ts b/libs/helper/src/lib/interfaces/info-item.interface.ts similarity index 100% rename from apps/api/src/app/info/interfaces/info-item.interface.ts rename to libs/helper/src/lib/interfaces/info-item.interface.ts diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-item.interface.ts b/libs/helper/src/lib/interfaces/portfolio-item.interface.ts similarity index 100% rename from apps/api/src/app/portfolio/interfaces/portfolio-item.interface.ts rename to libs/helper/src/lib/interfaces/portfolio-item.interface.ts diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-overview.interface.ts b/libs/helper/src/lib/interfaces/portfolio-overview.interface.ts similarity index 100% rename from apps/api/src/app/portfolio/interfaces/portfolio-overview.interface.ts rename to libs/helper/src/lib/interfaces/portfolio-overview.interface.ts