diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 9542b4c57..9ea500864 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -9,6 +9,7 @@ import { PortfolioItem, PortfolioOverview } from '@ghostfolio/helper/interfaces'; +import { DateRange } from '@ghostfolio/helper/types'; import { Inject, Injectable } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; import { @@ -30,7 +31,6 @@ import * as roundTo from 'round-to'; import { OrderService } from '../order/order.service'; import { RedisCacheService } from '../redis-cache/redis-cache.service'; import { UserService } from '../user/user.service'; -import { DateRange } from './interfaces/date-range.type'; import { HistoricalDataItem, PortfolioPositionDetail diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts index d557dea97..5143d0d0e 100644 --- a/apps/api/src/models/portfolio.ts +++ b/apps/api/src/models/portfolio.ts @@ -7,6 +7,7 @@ import { PortfolioReport, Position } from '@ghostfolio/helper/interfaces'; +import { DateRange } from '@ghostfolio/helper/types'; import { add, format, @@ -28,7 +29,6 @@ import * as roundTo from 'round-to'; import { UserWithSettings } from '../app/interfaces/user-with-settings'; import { OrderWithAccount } from '../app/order/interfaces/order-with-account.type'; -import { DateRange } from '../app/portfolio/interfaces/date-range.type'; import { DataProviderService } from '../services/data-provider.service'; import { ExchangeRateDataService } from '../services/exchange-rate-data.service'; import { IOrder } from '../services/interfaces/interfaces'; 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 90b3d242d..aa09949cb 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -1,7 +1,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 { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface'; import { PerformanceChartDialog } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.component'; import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type'; @@ -19,6 +18,7 @@ import { PortfolioPosition } from '@ghostfolio/helper/interfaces'; import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; +import { DateRange } from '@ghostfolio/helper/types'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/polyfills.ts b/apps/client/src/polyfills.ts index 054694fa9..873cf3ef2 100644 --- a/apps/client/src/polyfills.ts +++ b/apps/client/src/polyfills.ts @@ -56,9 +56,9 @@ * Zone JS is required by default for Angular itself. */ import 'zone.js/dist/zone'; // Included with Angular CLI. +import '@angular/localize/init'; /*************************************************************************************************** * APPLICATION IMPORTS */ -import '@angular/localize/init'; diff --git a/apps/api/src/app/portfolio/interfaces/date-range.type.ts b/libs/helper/src/lib/types/date-range.type.ts similarity index 100% rename from apps/api/src/app/portfolio/interfaces/date-range.type.ts rename to libs/helper/src/lib/types/date-range.type.ts diff --git a/libs/helper/src/lib/types/index.ts b/libs/helper/src/lib/types/index.ts new file mode 100644 index 000000000..1ef126373 --- /dev/null +++ b/libs/helper/src/lib/types/index.ts @@ -0,0 +1,3 @@ +import { DateRange } from './date-range.type'; + +export { DateRange };