From 47516e09031b11c88469bec0663bda55b7e4213e Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sat, 26 Oct 2024 12:05:40 +0200 Subject: [PATCH] chore: revert import changes Signed-off-by: Dominik Willner --- .../calculator/portfolio-calculator.ts | 27 ++++++++-------- .../calculator/twr/portfolio-calculator.ts | 7 ++--- .../coingecko/coingecko.service.ts | 27 ++++++++-------- .../data-provider/data-provider.service.ts | 23 +++++++------- .../eod-historical-data.service.ts | 29 +++++++++-------- .../financial-modeling-prep.service.ts | 27 ++++++++-------- .../google-sheets/google-sheets.service.ts | 31 +++++++++---------- .../interfaces/data-provider.interface.ts | 11 +++---- .../data-provider/manual/manual.service.ts | 31 +++++++++---------- .../rapid-api/rapid-api.service.ts | 27 ++++++++-------- .../yahoo-finance/yahoo-finance.service.ts | 29 +++++++++-------- .../exchange-rate-data.service.ts | 13 ++++---- .../admin-market-data-detail.component.ts | 2 +- .../allocations/allocations-page.component.ts | 11 +++---- .../app/pages/public/public-page.component.ts | 3 +- 15 files changed, 142 insertions(+), 156 deletions(-) diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts index c772a5f95..2b6e33c78 100644 --- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts @@ -1,3 +1,16 @@ +import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface'; +import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service'; +import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface'; +import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface'; +import { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface'; +import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface'; +import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service'; +import { getFactor } from '@ghostfolio/api/helper/portfolio.helper'; +import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; +import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces'; +import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service'; import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper'; import { PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME, @@ -38,20 +51,6 @@ import { } from 'date-fns'; import { first, isNumber, last, sortBy, sum, uniq, uniqBy } from 'lodash'; -import { getFactor } from '../../../helper/portfolio.helper'; -import { LogPerformance } from '../../../interceptors/performance-logging/performance-logging.interceptor'; -import { ConfigurationService } from '../../../services/configuration/configuration.service'; -import { ExchangeRateDataService } from '../../../services/exchange-rate-data/exchange-rate-data.service'; -import { IDataGatheringItem } from '../../../services/interfaces/interfaces'; -import { PortfolioSnapshotService } from '../../../services/queues/portfolio-snapshot/portfolio-snapshot.service'; -import { Activity } from '../../order/interfaces/activities.interface'; -import { RedisCacheService } from '../../redis-cache/redis-cache.service'; -import { CurrentRateService } from '../current-rate.service'; -import { PortfolioOrder } from '../interfaces/portfolio-order.interface'; -import { PortfolioSnapshotValue } from '../interfaces/snapshot-value.interface'; -import { TransactionPointSymbol } from '../interfaces/transaction-point-symbol.interface'; -import { TransactionPoint } from '../interfaces/transaction-point.interface'; - export abstract class PortfolioCalculator { protected static readonly ENABLE_LOGGING = false; diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts index 66d4cdfac..154740f7e 100644 --- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts @@ -1,3 +1,6 @@ +import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator'; +import { PortfolioOrderItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order-item.interface'; +import { getFactor } from '@ghostfolio/api/helper/portfolio.helper'; import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper'; import { DATE_FORMAT } from '@ghostfolio/common/helper'; import { @@ -12,10 +15,6 @@ import { Big } from 'big.js'; import { addMilliseconds, differenceInDays, format, isBefore } from 'date-fns'; import { cloneDeep, first, last, sortBy } from 'lodash'; -import { getFactor } from '../../../../helper/portfolio.helper'; -import { PortfolioOrderItem } from '../../interfaces/portfolio-order-item.interface'; -import { PortfolioCalculator } from '../portfolio-calculator'; - export class TWRPortfolioCalculator extends PortfolioCalculator { private chartDates: string[]; diff --git a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts index f1d4cbaea..539ba2e1d 100644 --- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts +++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts @@ -1,3 +1,16 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; import { DEFAULT_CURRENCY } from '@ghostfolio/common/config'; import { DATE_FORMAT } from '@ghostfolio/common/helper'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; @@ -12,20 +25,6 @@ import { import { format, fromUnixTime, getUnixTime } from 'date-fns'; import got, { Headers } from 'got'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class CoinGeckoService implements DataProviderInterface { private readonly apiUrl: string; diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.ts index b0448f639..1d250d5af 100644 --- a/apps/api/src/services/data-provider/data-provider.service.ts +++ b/apps/api/src/services/data-provider/data-provider.service.ts @@ -1,3 +1,14 @@ +import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service'; +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; +import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; +import { PropertyService } from '@ghostfolio/api/services/property/property.service'; import { DEFAULT_CURRENCY, DERIVED_CURRENCIES, @@ -19,18 +30,6 @@ import { eachDayOfInterval, format, isValid } from 'date-fns'; import { groupBy, isEmpty, isNumber, uniqWith } from 'lodash'; import ms from 'ms'; -import { RedisCacheService } from '../../app/redis-cache/redis-cache.service'; -import { LookupItem } from '../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../interfaces/interfaces'; -import { MarketDataService } from '../market-data/market-data.service'; -import { PrismaService } from '../prisma/prisma.service'; -import { PropertyService } from '../property/property.service'; -import { DataProviderInterface } from './interfaces/data-provider.interface'; - @Injectable() export class DataProviderService { private dataProviderMapping: Record; diff --git a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts index 99af685e6..5d8cfee92 100644 --- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts +++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts @@ -1,3 +1,17 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; +import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service'; import { DEFAULT_CURRENCY, REPLACE_NAME_PARTS @@ -17,21 +31,6 @@ import { addDays, format, isSameDay, isToday } from 'date-fns'; import got from 'got'; import { isNumber } from 'lodash'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { SymbolProfileService } from '../../symbol-profile/symbol-profile.service'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class EodHistoricalDataService implements DataProviderInterface { private apiKey: string; diff --git a/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts b/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts index e3a098b88..8f35b6313 100644 --- a/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts +++ b/apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts @@ -1,3 +1,16 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; import { DEFAULT_CURRENCY } from '@ghostfolio/common/config'; import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; @@ -7,20 +20,6 @@ import { DataSource, SymbolProfile } from '@prisma/client'; import { format, isAfter, isBefore, isSameDay } from 'date-fns'; import got from 'got'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class FinancialModelingPrepService implements DataProviderInterface { private apiKey: string; diff --git a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts index 1db5f3b36..c6c407486 100644 --- a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts +++ b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts @@ -1,3 +1,18 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; +import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; +import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service'; import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; @@ -6,22 +21,6 @@ import { DataSource, SymbolProfile } from '@prisma/client'; import { format } from 'date-fns'; import { GoogleSpreadsheet } from 'google-spreadsheet'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { PrismaService } from '../../prisma/prisma.service'; -import { SymbolProfileService } from '../../symbol-profile/symbol-profile.service'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class GoogleSheetsService implements DataProviderInterface { public constructor( diff --git a/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts b/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts index ca37e8ed9..fd2c32a5c 100644 --- a/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts +++ b/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts @@ -1,14 +1,13 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; import { Granularity } from '@ghostfolio/common/types'; import { DataSource, SymbolProfile } from '@prisma/client'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; - export interface DataProviderInterface { canHandle(symbol: string): boolean; diff --git a/apps/api/src/services/data-provider/manual/manual.service.ts b/apps/api/src/services/data-provider/manual/manual.service.ts index eeea75f61..418aadd0c 100644 --- a/apps/api/src/services/data-provider/manual/manual.service.ts +++ b/apps/api/src/services/data-provider/manual/manual.service.ts @@ -1,3 +1,18 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; +import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; +import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service'; import { DATE_FORMAT, extractNumberFromString, @@ -16,22 +31,6 @@ import { addDays, format, isBefore } from 'date-fns'; import got, { Headers } from 'got'; import jsonpath from 'jsonpath'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { PrismaService } from '../../prisma/prisma.service'; -import { SymbolProfileService } from '../../symbol-profile/symbol-profile.service'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class ManualService implements DataProviderInterface { public constructor( diff --git a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts index bb929a68a..51f8e6d04 100644 --- a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts +++ b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts @@ -1,3 +1,16 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; import { ghostfolioFearAndGreedIndexSymbol } from '@ghostfolio/common/config'; import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; @@ -7,20 +20,6 @@ import { DataSource, SymbolProfile } from '@prisma/client'; import { format } from 'date-fns'; import got from 'got'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { ConfigurationService } from '../../configuration/configuration.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class RapidApiService implements DataProviderInterface { public constructor( diff --git a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts index 855721932..0172c5324 100644 --- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts +++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts @@ -1,3 +1,17 @@ +import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; +import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service'; +import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service'; +import { + DataProviderInterface, + GetDividendsParams, + GetHistoricalParams, + GetQuotesParams, + GetSearchParams +} from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface'; +import { + IDataProviderHistoricalResponse, + IDataProviderResponse +} from '@ghostfolio/api/services/interfaces/interfaces'; import { DEFAULT_CURRENCY } from '@ghostfolio/common/config'; import { DATE_FORMAT } from '@ghostfolio/common/helper'; import { DataProviderInfo } from '@ghostfolio/common/interfaces'; @@ -13,21 +27,6 @@ import { } from 'yahoo-finance2/dist/esm/src/modules/historical'; import { Quote } from 'yahoo-finance2/dist/esm/src/modules/quote'; -import { LookupItem } from '../../../app/symbol/interfaces/lookup-item.interface'; -import { CryptocurrencyService } from '../../cryptocurrency/cryptocurrency.service'; -import { - IDataProviderHistoricalResponse, - IDataProviderResponse -} from '../../interfaces/interfaces'; -import { YahooFinanceDataEnhancerService } from '../data-enhancer/yahoo-finance/yahoo-finance.service'; -import { - DataProviderInterface, - GetDividendsParams, - GetHistoricalParams, - GetQuotesParams, - GetSearchParams -} from '../interfaces/data-provider.interface'; - @Injectable() export class YahooFinanceService implements DataProviderInterface { public constructor( diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts index 10c163711..cf0cdddd2 100644 --- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts +++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts @@ -1,3 +1,9 @@ +import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; +import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces'; +import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; +import { PropertyService } from '@ghostfolio/api/services/property/property.service'; import { DEFAULT_CURRENCY, DERIVED_CURRENCIES, @@ -20,13 +26,6 @@ import { import { isNumber, uniq } from 'lodash'; import ms from 'ms'; -import { LogPerformance } from '../../interceptors/performance-logging/performance-logging.interceptor'; -import { DataProviderService } from '../data-provider/data-provider.service'; -import { IDataGatheringItem } from '../interfaces/interfaces'; -import { MarketDataService } from '../market-data/market-data.service'; -import { PrismaService } from '../prisma/prisma.service'; -import { PropertyService } from '../property/property.service'; - @Injectable() export class ExchangeRateDataService { private currencies: string[] = []; diff --git a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts index b8def9694..82bff1913 100644 --- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts +++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts @@ -1,3 +1,4 @@ +import { UserService } from '@ghostfolio/client/services/user/user.service'; import { DATE_FORMAT, getDateFormatString, @@ -31,7 +32,6 @@ import { first, last } from 'lodash'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, takeUntil } from 'rxjs'; -import { UserService } from '../../services/user/user.service'; import { MarketDataDetailDialogParams } from './market-data-detail-dialog/interfaces/interfaces'; import { MarketDataDetailDialog } from './market-data-detail-dialog/market-data-detail-dialog.component'; diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts index 4b62f7756..46ef9ebb1 100644 --- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts +++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts @@ -1,3 +1,8 @@ +import { AccountDetailDialog } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.component'; +import { AccountDetailDialogParams } from '@ghostfolio/client/components/account-detail-dialog/interfaces/interfaces'; +import { DataService } from '@ghostfolio/client/services/data.service'; +import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; +import { UserService } from '@ghostfolio/client/services/user/user.service'; import { MAX_TOP_HOLDINGS, UNKNOWN_KEY } from '@ghostfolio/common/config'; import { prettifySymbol } from '@ghostfolio/common/helper'; import { @@ -20,12 +25,6 @@ import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { AccountDetailDialog } from '../../../components/account-detail-dialog/account-detail-dialog.component'; -import { AccountDetailDialogParams } from '../../../components/account-detail-dialog/interfaces/interfaces'; -import { DataService } from '../../../services/data.service'; -import { ImpersonationStorageService } from '../../../services/impersonation-storage.service'; -import { UserService } from '../../../services/user/user.service'; - @Component({ selector: 'gf-allocations-page', styleUrls: ['./allocations-page.scss'], diff --git a/apps/client/src/app/pages/public/public-page.component.ts b/apps/client/src/app/pages/public/public-page.component.ts index 1c678d0c1..3000c20d8 100644 --- a/apps/client/src/app/pages/public/public-page.component.ts +++ b/apps/client/src/app/pages/public/public-page.component.ts @@ -1,3 +1,4 @@ +import { DataService } from '@ghostfolio/client/services/data.service'; import { UNKNOWN_KEY } from '@ghostfolio/common/config'; import { prettifySymbol } from '@ghostfolio/common/helper'; import { @@ -15,8 +16,6 @@ import { DeviceDetectorService } from 'ngx-device-detector'; import { EMPTY, Subject } from 'rxjs'; import { catchError, takeUntil } from 'rxjs/operators'; -import { DataService } from '../../services/data.service'; - @Component({ host: { class: 'page' }, selector: 'gf-public-page',