From 5152531ad00361165d9efbef33495f43c0d466d2 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Wed, 21 Apr 2021 20:16:10 +0200 Subject: [PATCH] Improve imports --- apps/api/src/app/access/access.module.ts | 2 +- apps/api/src/app/access/access.service.ts | 2 +- apps/api/src/app/admin/admin.controller.ts | 4 ++-- apps/api/src/app/admin/admin.module.ts | 18 +++++++-------- apps/api/src/app/admin/admin.service.ts | 4 ++-- apps/api/src/app/auth/auth.controller.ts | 2 +- apps/api/src/app/auth/auth.module.ts | 4 ++-- apps/api/src/app/auth/auth.service.ts | 2 +- apps/api/src/app/auth/google.strategy.ts | 2 +- apps/api/src/app/auth/jwt.strategy.ts | 4 ++-- apps/api/src/app/cache/cache.module.ts | 2 +- apps/api/src/app/cache/cache.service.ts | 4 +--- .../app/experimental/experimental.module.ts | 18 +++++++-------- .../app/experimental/experimental.service.ts | 10 ++++----- apps/api/src/app/info/info.module.ts | 4 ++-- apps/api/src/app/info/info.service.ts | 4 ++-- apps/api/src/app/order/order.controller.ts | 6 ++--- apps/api/src/app/order/order.module.ts | 18 +++++++-------- apps/api/src/app/order/order.service.ts | 4 ++-- .../src/app/portfolio/portfolio.controller.ts | 12 +++++----- .../api/src/app/portfolio/portfolio.module.ts | 22 +++++++++---------- .../src/app/portfolio/portfolio.service.ts | 15 ++++++------- .../src/app/redis-cache/redis-cache.module.ts | 2 +- .../app/redis-cache/redis-cache.service.ts | 3 +-- apps/api/src/app/symbol/symbol.module.ts | 14 ++++++------ apps/api/src/app/symbol/symbol.service.ts | 4 ++-- apps/api/src/app/user/user.module.ts | 4 ++-- apps/api/src/app/user/user.service.ts | 4 ++-- .../src/models/interfaces/rule.interface.ts | 3 ++- .../base-currency-current-investment.ts | 4 ++-- .../current-investment.ts | 4 ++-- .../app/components/header/header.component.ts | 9 ++++---- .../app/components/header/header.module.ts | 2 +- .../performance-chart-dialog.component.ts | 2 +- .../performance-chart-dialog.module.ts | 2 +- .../position-detail-dialog.component.ts | 2 +- .../position-detail-dialog.module.ts | 2 +- .../src/app/components/rules/rules.module.ts | 2 +- .../src/app/core/http-response.interceptor.ts | 1 + .../app/pages/about/about-page.component.ts | 5 ++--- .../account/account-page-routing.module.ts | 2 +- .../pages/account/account-page.component.ts | 4 ++-- .../app/pages/account/account-page.module.ts | 2 +- .../pages/admin/admin-page-routing.module.ts | 2 +- .../app/pages/admin/admin-page.component.ts | 7 +++--- .../src/app/pages/admin/admin-page.module.ts | 2 +- .../analysis/analysis-page-routing.module.ts | 2 +- .../pages/analysis/analysis-page.component.ts | 9 ++++---- .../pages/analysis/analysis-page.module.ts | 10 ++++----- .../src/app/pages/auth/auth-page.component.ts | 3 +-- .../pages/home/home-page-routing.module.ts | 2 +- .../src/app/pages/home/home-page.component.ts | 21 +++++++++--------- .../src/app/pages/home/home-page.module.ts | 14 ++++++------ .../pages/login/login-page-routing.module.ts | 2 +- .../app/pages/login/login-page.component.ts | 7 +++--- .../src/app/pages/login/login-page.module.ts | 4 ++-- .../report/report-page-routing.module.ts | 2 +- .../app/pages/report/report-page.component.ts | 3 +-- .../app/pages/report/report-page.module.ts | 2 +- .../transactions-page-routing.module.ts | 2 +- .../transactions-page.component.ts | 6 ++--- .../transactions/transactions-page.module.ts | 2 +- tsconfig.base.json | 2 ++ 63 files changed, 168 insertions(+), 176 deletions(-) diff --git a/apps/api/src/app/access/access.module.ts b/apps/api/src/app/access/access.module.ts index 4f810e03c..beaf98cad 100644 --- a/apps/api/src/app/access/access.module.ts +++ b/apps/api/src/app/access/access.module.ts @@ -1,6 +1,6 @@ +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; -import { PrismaService } from '../../services/prisma.service'; import { AccessController } from './access.controller'; import { AccessService } from './access.service'; diff --git a/apps/api/src/app/access/access.service.ts b/apps/api/src/app/access/access.service.ts index 87f2b33d0..316837dec 100644 --- a/apps/api/src/app/access/access.service.ts +++ b/apps/api/src/app/access/access.service.ts @@ -1,7 +1,7 @@ +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Injectable } from '@nestjs/common'; import { Prisma } from '@prisma/client'; -import { PrismaService } from '../../services/prisma.service'; import { AccessWithGranteeUser } from './interfaces/access-with-grantee-user.type'; @Injectable() diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.ts index 1d4d73856..0ae58bae1 100644 --- a/apps/api/src/app/admin/admin.controller.ts +++ b/apps/api/src/app/admin/admin.controller.ts @@ -1,3 +1,5 @@ +import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; +import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Controller, @@ -9,10 +11,8 @@ import { } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; -import { RequestWithUser } from 'apps/api/src/app/interfaces/request-with-user.type'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { DataGatheringService } from '../../services/data-gathering.service'; import { AdminService } from './admin.service'; import { AdminData } from './interfaces/admin-data.interface'; diff --git a/apps/api/src/app/admin/admin.module.ts b/apps/api/src/app/admin/admin.module.ts index 7f18fc68d..a78c435e3 100644 --- a/apps/api/src/app/admin/admin.module.ts +++ b/apps/api/src/app/admin/admin.module.ts @@ -1,14 +1,14 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service'; +import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; +import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; +import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; -import { ConfigurationService } from '../../services/configuration.service'; -import { DataGatheringService } from '../../services/data-gathering.service'; -import { DataProviderService } from '../../services/data-provider.service'; -import { AlphaVantageService } from '../../services/data-provider/alpha-vantage/alpha-vantage.service'; -import { GhostfolioScraperApiService } from '../../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; -import { RakutenRapidApiService } from '../../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; -import { YahooFinanceService } from '../../services/data-provider/yahoo-finance/yahoo-finance.service'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { PrismaService } from '../../services/prisma.service'; import { AdminController } from './admin.controller'; import { AdminService } from './admin.service'; diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts index c5f7c10c9..46a5f01b8 100644 --- a/apps/api/src/app/admin/admin.service.ts +++ b/apps/api/src/app/admin/admin.service.ts @@ -1,8 +1,8 @@ +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Injectable } from '@nestjs/common'; import { Currency } from '@prisma/client'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { PrismaService } from '../../services/prisma.service'; import { AdminData } from './interfaces/admin-data.interface'; @Injectable() diff --git a/apps/api/src/app/auth/auth.controller.ts b/apps/api/src/app/auth/auth.controller.ts index c01d11064..cfafa080e 100644 --- a/apps/api/src/app/auth/auth.controller.ts +++ b/apps/api/src/app/auth/auth.controller.ts @@ -1,3 +1,4 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { Controller, Get, @@ -10,7 +11,6 @@ import { import { AuthGuard } from '@nestjs/passport'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { ConfigurationService } from '../../services/configuration.service'; import { AuthService } from './auth.service'; @Controller('auth') diff --git a/apps/api/src/app/auth/auth.module.ts b/apps/api/src/app/auth/auth.module.ts index 664aa7915..0519e2509 100644 --- a/apps/api/src/app/auth/auth.module.ts +++ b/apps/api/src/app/auth/auth.module.ts @@ -1,8 +1,8 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { UserService } from '../user/user.service'; import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; diff --git a/apps/api/src/app/auth/auth.service.ts b/apps/api/src/app/auth/auth.service.ts index 946e44f4d..b7d334773 100644 --- a/apps/api/src/app/auth/auth.service.ts +++ b/apps/api/src/app/auth/auth.service.ts @@ -1,7 +1,7 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; -import { ConfigurationService } from '../../services/configuration.service'; import { UserService } from '../user/user.service'; import { ValidateOAuthLoginParams } from './interfaces/interfaces'; diff --git a/apps/api/src/app/auth/google.strategy.ts b/apps/api/src/app/auth/google.strategy.ts index 8412dc37c..5856acb1c 100644 --- a/apps/api/src/app/auth/google.strategy.ts +++ b/apps/api/src/app/auth/google.strategy.ts @@ -1,9 +1,9 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { Injectable } from '@nestjs/common'; import { PassportStrategy } from '@nestjs/passport'; import { Provider } from '@prisma/client'; import { Strategy } from 'passport-google-oauth20'; -import { ConfigurationService } from '../../services/configuration.service'; import { AuthService } from './auth.service'; @Injectable() diff --git a/apps/api/src/app/auth/jwt.strategy.ts b/apps/api/src/app/auth/jwt.strategy.ts index 967dbcce9..29b7deb2a 100644 --- a/apps/api/src/app/auth/jwt.strategy.ts +++ b/apps/api/src/app/auth/jwt.strategy.ts @@ -1,9 +1,9 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Injectable, UnauthorizedException } from '@nestjs/common'; import { PassportStrategy } from '@nestjs/passport'; import { ExtractJwt, Strategy } from 'passport-jwt'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { UserService } from '../user/user.service'; @Injectable() diff --git a/apps/api/src/app/cache/cache.module.ts b/apps/api/src/app/cache/cache.module.ts index 88c5080a2..7c5a01309 100644 --- a/apps/api/src/app/cache/cache.module.ts +++ b/apps/api/src/app/cache/cache.module.ts @@ -1,6 +1,6 @@ +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; -import { PrismaService } from '../../services/prisma.service'; import { RedisCacheModule } from '../redis-cache/redis-cache.module'; import { CacheController } from './cache.controller'; import { CacheService } from './cache.service'; diff --git a/apps/api/src/app/cache/cache.service.ts b/apps/api/src/app/cache/cache.service.ts index 8e8c92cae..357c0fdff 100644 --- a/apps/api/src/app/cache/cache.service.ts +++ b/apps/api/src/app/cache/cache.service.ts @@ -1,7 +1,5 @@ +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Injectable } from '@nestjs/common'; -import { Prisma, User } from '@prisma/client'; - -import { PrismaService } from '../../services/prisma.service'; @Injectable() export class CacheService { diff --git a/apps/api/src/app/experimental/experimental.module.ts b/apps/api/src/app/experimental/experimental.module.ts index 0abc8e105..3ab67ffb0 100644 --- a/apps/api/src/app/experimental/experimental.module.ts +++ b/apps/api/src/app/experimental/experimental.module.ts @@ -1,14 +1,14 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service'; +import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; +import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; +import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; +import { RulesService } from '@ghostfolio/api/services/rules.service'; import { Module } from '@nestjs/common'; -import { ConfigurationService } from '../../services/configuration.service'; -import { DataProviderService } from '../../services/data-provider.service'; -import { AlphaVantageService } from '../../services/data-provider/alpha-vantage/alpha-vantage.service'; -import { GhostfolioScraperApiService } from '../../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; -import { RakutenRapidApiService } from '../../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; -import { YahooFinanceService } from '../../services/data-provider/yahoo-finance/yahoo-finance.service'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { PrismaService } from '../../services/prisma.service'; -import { RulesService } from '../../services/rules.service'; import { ExperimentalController } from './experimental.controller'; import { ExperimentalService } from './experimental.service'; diff --git a/apps/api/src/app/experimental/experimental.service.ts b/apps/api/src/app/experimental/experimental.service.ts index 478bc9923..0cdff4eaf 100644 --- a/apps/api/src/app/experimental/experimental.service.ts +++ b/apps/api/src/app/experimental/experimental.service.ts @@ -1,12 +1,12 @@ +import { Portfolio } from '@ghostfolio/api/models/portfolio'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; +import { RulesService } from '@ghostfolio/api/services/rules.service'; import { Injectable } from '@nestjs/common'; import { Currency, Type } from '@prisma/client'; import { parseISO } from 'date-fns'; -import { Portfolio } from '../../models/portfolio'; -import { DataProviderService } from '../../services/data-provider.service'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { PrismaService } from '../../services/prisma.service'; -import { RulesService } from '../../services/rules.service'; import { OrderWithPlatform } from '../order/interfaces/order-with-platform.type'; import { CreateOrderDto } from './create-order.dto'; import { Data } from './interfaces/data.interface'; diff --git a/apps/api/src/app/info/info.module.ts b/apps/api/src/app/info/info.module.ts index 3c82b8a13..8e3b49bb7 100644 --- a/apps/api/src/app/info/info.module.ts +++ b/apps/api/src/app/info/info.module.ts @@ -1,8 +1,8 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { InfoController } from './info.controller'; import { InfoService } from './info.service'; diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts index 88057a348..c08407803 100644 --- a/apps/api/src/app/info/info.service.ts +++ b/apps/api/src/app/info/info.service.ts @@ -1,10 +1,10 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { permissions } from '@ghostfolio/helper'; import { Injectable } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; import { Currency } from '@prisma/client'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { InfoItem } from './interfaces/info-item.interface'; @Injectable() diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index e62667f6c..c3a5febab 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -1,3 +1,6 @@ +import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; +import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Body, @@ -15,12 +18,9 @@ import { import { REQUEST } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; import { Order as OrderModel } from '@prisma/client'; -import { RequestWithUser } from 'apps/api/src/app/interfaces/request-with-user.type'; import { parseISO } from 'date-fns'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { nullifyValuesInObjects } from '../../helper/object.helper'; -import { ImpersonationService } from '../../services/impersonation.service'; import { CreateOrderDto } from './create-order.dto'; import { OrderService } from './order.service'; import { UpdateOrderDto } from './update-order.dto'; diff --git a/apps/api/src/app/order/order.module.ts b/apps/api/src/app/order/order.module.ts index d7f7a4482..93bcd3cb3 100644 --- a/apps/api/src/app/order/order.module.ts +++ b/apps/api/src/app/order/order.module.ts @@ -1,14 +1,14 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service'; +import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; +import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; +import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; -import { ConfigurationService } from '../../services/configuration.service'; -import { DataGatheringService } from '../../services/data-gathering.service'; -import { DataProviderService } from '../../services/data-provider.service'; -import { AlphaVantageService } from '../../services/data-provider/alpha-vantage/alpha-vantage.service'; -import { GhostfolioScraperApiService } from '../../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; -import { RakutenRapidApiService } from '../../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; -import { YahooFinanceService } from '../../services/data-provider/yahoo-finance/yahoo-finance.service'; -import { ImpersonationService } from '../../services/impersonation.service'; -import { PrismaService } from '../../services/prisma.service'; import { CacheService } from '../cache/cache.service'; import { RedisCacheModule } from '../redis-cache/redis-cache.module'; import { OrderController } from './order.controller'; diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index a1201a19d..f12e3aa73 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -1,8 +1,8 @@ +import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Injectable } from '@nestjs/common'; import { Order, Prisma } from '@prisma/client'; -import { DataGatheringService } from '../../services/data-gathering.service'; -import { PrismaService } from '../../services/prisma.service'; import { CacheService } from '../cache/cache.service'; import { RedisCacheService } from '../redis-cache/redis-cache.service'; import { OrderWithPlatform } from './interfaces/order-with-platform.type'; diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index 0a997aa4c..449badab1 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -1,3 +1,9 @@ +import { + hasNotDefinedValuesInObject, + nullifyValuesInObject +} from '@ghostfolio/api/helper/object.helper'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Controller, @@ -15,12 +21,6 @@ import { AuthGuard } from '@nestjs/passport'; import { Response } from 'express'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { - hasNotDefinedValuesInObject, - nullifyValuesInObject -} from '../../helper/object.helper'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { ImpersonationService } from '../../services/impersonation.service'; import { RequestWithUser } from '../interfaces/request-with-user.type'; import { PortfolioItem } from './interfaces/portfolio-item.interface'; import { PortfolioOverview } from './interfaces/portfolio-overview.interface'; diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.ts index 8559c348e..88fe47c64 100644 --- a/apps/api/src/app/portfolio/portfolio.module.ts +++ b/apps/api/src/app/portfolio/portfolio.module.ts @@ -1,16 +1,16 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service'; +import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; +import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; +import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; +import { RulesService } from '@ghostfolio/api/services/rules.service'; import { Module } from '@nestjs/common'; -import { ConfigurationService } from '../../services/configuration.service'; -import { DataGatheringService } from '../../services/data-gathering.service'; -import { DataProviderService } from '../../services/data-provider.service'; -import { AlphaVantageService } from '../../services/data-provider/alpha-vantage/alpha-vantage.service'; -import { GhostfolioScraperApiService } from '../../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; -import { RakutenRapidApiService } from '../../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; -import { YahooFinanceService } from '../../services/data-provider/yahoo-finance/yahoo-finance.service'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { ImpersonationService } from '../../services/impersonation.service'; -import { PrismaService } from '../../services/prisma.service'; -import { RulesService } from '../../services/rules.service'; import { CacheService } from '../cache/cache.service'; import { OrderService } from '../order/order.service'; import { RedisCacheModule } from '../redis-cache/redis-cache.module'; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 6c697e325..df7d33c09 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -1,6 +1,12 @@ +import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; +import { Portfolio } from '@ghostfolio/api/models/portfolio'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; +import { IOrder } from '@ghostfolio/api/services/interfaces/interfaces'; +import { RulesService } from '@ghostfolio/api/services/rules.service'; import { Inject, Injectable } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; -import { RequestWithUser } from 'apps/api/src/app/interfaces/request-with-user.type'; import { add, format, @@ -9,7 +15,6 @@ import { getYear, isAfter, isSameDay, - parse, parseISO, setDate, setMonth, @@ -18,12 +23,6 @@ import { import { isEmpty } from 'lodash'; import * as roundTo from 'round-to'; -import { Portfolio } from '../../models/portfolio'; -import { DataProviderService } from '../../services/data-provider.service'; -import { ExchangeRateDataService } from '../../services/exchange-rate-data.service'; -import { ImpersonationService } from '../../services/impersonation.service'; -import { IOrder } from '../../services/interfaces/interfaces'; -import { RulesService } from '../../services/rules.service'; import { OrderService } from '../order/order.service'; import { RedisCacheService } from '../redis-cache/redis-cache.service'; import { UserService } from '../user/user.service'; diff --git a/apps/api/src/app/redis-cache/redis-cache.module.ts b/apps/api/src/app/redis-cache/redis-cache.module.ts index 9e79a7b25..e3275276b 100644 --- a/apps/api/src/app/redis-cache/redis-cache.module.ts +++ b/apps/api/src/app/redis-cache/redis-cache.module.ts @@ -1,8 +1,8 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { CacheModule, Module } from '@nestjs/common'; import { ConfigModule, ConfigService } from '@nestjs/config'; import * as redisStore from 'cache-manager-redis-store'; -import { ConfigurationService } from '../../services/configuration.service'; import { RedisCacheService } from './redis-cache.service'; @Module({ diff --git a/apps/api/src/app/redis-cache/redis-cache.service.ts b/apps/api/src/app/redis-cache/redis-cache.service.ts index 1da9f06a9..677fcb7b1 100644 --- a/apps/api/src/app/redis-cache/redis-cache.service.ts +++ b/apps/api/src/app/redis-cache/redis-cache.service.ts @@ -1,8 +1,7 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common'; import { Cache } from 'cache-manager'; -import { ConfigurationService } from '../../services/configuration.service'; - @Injectable() export class RedisCacheService { public constructor( diff --git a/apps/api/src/app/symbol/symbol.module.ts b/apps/api/src/app/symbol/symbol.module.ts index ad3bf7558..2fb3a9d76 100644 --- a/apps/api/src/app/symbol/symbol.module.ts +++ b/apps/api/src/app/symbol/symbol.module.ts @@ -1,12 +1,12 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service'; +import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; +import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; +import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; -import { ConfigurationService } from '../../services/configuration.service'; -import { DataProviderService } from '../../services/data-provider.service'; -import { AlphaVantageService } from '../../services/data-provider/alpha-vantage/alpha-vantage.service'; -import { GhostfolioScraperApiService } from '../../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service'; -import { RakutenRapidApiService } from '../../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service'; -import { YahooFinanceService } from '../../services/data-provider/yahoo-finance/yahoo-finance.service'; -import { PrismaService } from '../../services/prisma.service'; import { SymbolController } from './symbol.controller'; import { SymbolService } from './symbol.service'; diff --git a/apps/api/src/app/symbol/symbol.service.ts b/apps/api/src/app/symbol/symbol.service.ts index db56e8459..1bb0435bb 100644 --- a/apps/api/src/app/symbol/symbol.service.ts +++ b/apps/api/src/app/symbol/symbol.service.ts @@ -1,9 +1,9 @@ +import { DataProviderService } from '@ghostfolio/api/services/data-provider.service'; +import { convertFromYahooSymbol } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service'; import { Injectable } from '@nestjs/common'; import { Currency } from '@prisma/client'; -import { convertFromYahooSymbol } from 'apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service'; import * as bent from 'bent'; -import { DataProviderService } from '../../services/data-provider.service'; import { LookupItem } from './interfaces/lookup-item.interface'; import { SymbolItem } from './interfaces/symbol-item.interface'; diff --git a/apps/api/src/app/user/user.module.ts b/apps/api/src/app/user/user.module.ts index 7dfc3b4fe..df9439c80 100644 --- a/apps/api/src/app/user/user.module.ts +++ b/apps/api/src/app/user/user.module.ts @@ -1,8 +1,8 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { Module } from '@nestjs/common'; import { JwtModule } from '@nestjs/jwt'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { UserController } from './user.controller'; import { UserService } from './user.service'; diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index a1eab374c..8aacebcee 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -1,3 +1,5 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma.service'; import { getPermissions, locale, @@ -8,8 +10,6 @@ import { Injectable } from '@nestjs/common'; import { Currency, Prisma, Provider, User } from '@prisma/client'; import { add } from 'date-fns'; -import { ConfigurationService } from '../../services/configuration.service'; -import { PrismaService } from '../../services/prisma.service'; import { UserWithSettings } from '../interfaces/user-with-settings'; import { User as IUser } from './interfaces/user.interface'; diff --git a/apps/api/src/models/interfaces/rule.interface.ts b/apps/api/src/models/interfaces/rule.interface.ts index 0a1434874..72b6cf606 100644 --- a/apps/api/src/models/interfaces/rule.interface.ts +++ b/apps/api/src/models/interfaces/rule.interface.ts @@ -1,4 +1,5 @@ -import { PortfolioPosition } from '../../app/portfolio/interfaces/portfolio-position.interface'; +import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; + import { EvaluationResult } from './evaluation-result.interface'; export interface RuleInterface { diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts index e77f80043..8f266fc7a 100644 --- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts +++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts @@ -1,5 +1,5 @@ -import { PortfolioPosition } from 'apps/api/src/app/portfolio/interfaces/portfolio-position.interface'; -import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service'; +import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { Rule } from '../../rule'; diff --git a/apps/api/src/models/rules/platform-cluster-risk/current-investment.ts b/apps/api/src/models/rules/platform-cluster-risk/current-investment.ts index 07033e4bc..b9fb3efa7 100644 --- a/apps/api/src/models/rules/platform-cluster-risk/current-investment.ts +++ b/apps/api/src/models/rules/platform-cluster-risk/current-investment.ts @@ -1,5 +1,5 @@ -import { PortfolioPosition } from 'apps/api/src/app/portfolio/interfaces/portfolio-position.interface'; -import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service'; +import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { Rule } from '../../rule'; diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts index d0669463a..94e202bdd 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -6,17 +6,16 @@ import { } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; +import { LoginWithAccessTokenDialog } from '@ghostfolio/client/app/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { hasPermission, permissions } from '@ghostfolio/helper'; import { InfoItem } from 'apps/api/src/app/info/interfaces/info-item.interface'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; import { EMPTY, Subject } from 'rxjs'; import { catchError, takeUntil } from 'rxjs/operators'; -import { LoginWithAccessTokenDialog } from '../../pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component'; -import { DataService } from '../../services/data.service'; -import { ImpersonationStorageService } from '../../services/impersonation-storage.service'; -import { TokenStorageService } from '../../services/token-storage.service'; - @Component({ selector: 'gf-header', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/client/src/app/components/header/header.module.ts b/apps/client/src/app/components/header/header.module.ts index 44b492e78..f5e89d592 100644 --- a/apps/client/src/app/components/header/header.module.ts +++ b/apps/client/src/app/components/header/header.module.ts @@ -4,8 +4,8 @@ import { MatButtonModule } from '@angular/material/button'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterModule } from '@angular/router'; +import { LoginWithAccessTokenDialogModule } from '@ghostfolio/client/app/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.module'; -import { LoginWithAccessTokenDialogModule } from '../../pages/login/login-with-access-token-dialog/login-with-access-token-dialog.module'; import { GfLogoModule } from '../logo/logo.module'; import { HeaderComponent } from './header.component'; diff --git a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts index f68f66c0e..d61ba9504 100644 --- a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts +++ b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts @@ -5,9 +5,9 @@ import { Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; import { isToday, parse } from 'date-fns'; -import { DataService } from '../../services/data.service'; import { LineChartItem } from '../line-chart/interfaces/line-chart.interface'; import { PositionDetailDialogParams } from './interfaces/interfaces'; diff --git a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts index 5a377d352..4555058b6 100644 --- a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts +++ b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts @@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; +import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { GfLineChartModule } from '../../components/line-chart/line-chart.module'; import { GfDialogFooterModule } from '../dialog-footer/dialog-footer.module'; import { GfDialogHeaderModule } from '../dialog-header/dialog-header.module'; import { GfFearAndGreedIndexModule } from '../fear-and-greed-index/fear-and-greed-index.module'; diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts index 0cee091d3..a023ae92d 100644 --- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts +++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts @@ -5,9 +5,9 @@ import { Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; import { format, isSameMonth, isToday, parseISO } from 'date-fns'; -import { DataService } from '../../../services/data.service'; import { LineChartItem } from '../../line-chart/interfaces/line-chart.interface'; import { PositionDetailDialogParams } from './interfaces/interfaces'; diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts index 21ac8535f..1355117ee 100644 --- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts +++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts @@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; +import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { GfLineChartModule } from '../../../components/line-chart/line-chart.module'; import { GfDialogFooterModule } from '../../dialog-footer/dialog-footer.module'; import { GfDialogHeaderModule } from '../../dialog-header/dialog-header.module'; import { GfValueModule } from '../../value/value.module'; diff --git a/apps/client/src/app/components/rules/rules.module.ts b/apps/client/src/app/components/rules/rules.module.ts index 6d0b0783d..22e0881d6 100644 --- a/apps/client/src/app/components/rules/rules.module.ts +++ b/apps/client/src/app/components/rules/rules.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; -import { GfRuleModule } from 'apps/client/src/app/components/rule/rule.module'; +import { GfRuleModule } from '@ghostfolio/client/app/components/rule/rule.module'; import { GfNoTransactionsInfoModule } from '../no-transactions-info/no-transactions-info.module'; import { GfPositionModule } from '../position/position.module'; diff --git a/apps/client/src/app/core/http-response.interceptor.ts b/apps/client/src/app/core/http-response.interceptor.ts index a44db3320..72de866d2 100644 --- a/apps/client/src/app/core/http-response.interceptor.ts +++ b/apps/client/src/app/core/http-response.interceptor.ts @@ -19,6 +19,7 @@ import { Router } from '@angular/router'; import { StatusCodes } from 'http-status-codes'; import { Observable, throwError } from 'rxjs'; import { catchError, tap } from 'rxjs/operators'; + import { TokenStorageService } from '../services/token-storage.service'; @Injectable() diff --git a/apps/client/src/app/pages/about/about-page.component.ts b/apps/client/src/app/pages/about/about-page.component.ts index 0bbd94266..b4963e002 100644 --- a/apps/client/src/app/pages/about/about-page.component.ts +++ b/apps/client/src/app/pages/about/about-page.component.ts @@ -1,13 +1,12 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { baseCurrency } from '@ghostfolio/helper'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; import { environment } from 'apps/client/src/environments/environment'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { DataService } from '../../services/data.service'; -import { TokenStorageService } from '../../services/token-storage.service'; - @Component({ selector: 'gf-about-page', templateUrl: './about-page.html', diff --git a/apps/client/src/app/pages/account/account-page-routing.module.ts b/apps/client/src/app/pages/account/account-page-routing.module.ts index 14bdb3bb4..7fb54aef2 100644 --- a/apps/client/src/app/pages/account/account-page-routing.module.ts +++ b/apps/client/src/app/pages/account/account-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { AccountPageComponent } from './account-page.component'; const routes: Routes = [ diff --git a/apps/client/src/app/pages/account/account-page.component.ts b/apps/client/src/app/pages/account/account-page.component.ts index 605eaf70c..e11df165d 100644 --- a/apps/client/src/app/pages/account/account-page.component.ts +++ b/apps/client/src/app/pages/account/account-page.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; import { Access } from 'apps/api/src/app/access/interfaces/access.interface'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { DataService } from '../../services/data.service'; -import { TokenStorageService } from '../../services/token-storage.service'; import { Currency } from '.prisma/client'; @Component({ diff --git a/apps/client/src/app/pages/account/account-page.module.ts b/apps/client/src/app/pages/account/account-page.module.ts index fd3dd63cc..71d6d6ecb 100644 --- a/apps/client/src/app/pages/account/account-page.module.ts +++ b/apps/client/src/app/pages/account/account-page.module.ts @@ -4,8 +4,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; +import { GfPortfolioAccessTableModule } from '@ghostfolio/client/app/components/access-table/access-table.module'; -import { GfPortfolioAccessTableModule } from '../../components/access-table/access-table.module'; import { AccountPageRoutingModule } from './account-page-routing.module'; import { AccountPageComponent } from './account-page.component'; diff --git a/apps/client/src/app/pages/admin/admin-page-routing.module.ts b/apps/client/src/app/pages/admin/admin-page-routing.module.ts index e69d3139b..91c2e0fbf 100644 --- a/apps/client/src/app/pages/admin/admin-page-routing.module.ts +++ b/apps/client/src/app/pages/admin/admin-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { AdminPageComponent } from './admin-page.component'; const routes: Routes = [ diff --git a/apps/client/src/app/pages/admin/admin-page.component.ts b/apps/client/src/app/pages/admin/admin-page.component.ts index 16cc969e3..bf38af4f7 100644 --- a/apps/client/src/app/pages/admin/admin-page.component.ts +++ b/apps/client/src/app/pages/admin/admin-page.component.ts @@ -1,14 +1,13 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { AdminService } from '@ghostfolio/client/app/services/admin.service'; +import { CacheService } from '@ghostfolio/client/app/services/cache.service'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; import { AdminData } from 'apps/api/src/app/admin/interfaces/admin-data.interface'; import { formatDistanceToNow, isValid, parseISO, sub } from 'date-fns'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { AdminService } from '../../services/admin.service'; -import { CacheService } from '../../services/cache.service'; -import { DataService } from '../../services/data.service'; - @Component({ selector: 'gf-admin-page', templateUrl: './admin-page.html', diff --git a/apps/client/src/app/pages/admin/admin-page.module.ts b/apps/client/src/app/pages/admin/admin-page.module.ts index c5ac591ae..66f86a780 100644 --- a/apps/client/src/app/pages/admin/admin-page.module.ts +++ b/apps/client/src/app/pages/admin/admin-page.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; +import { CacheService } from '@ghostfolio/client/app/services/cache.service'; -import { CacheService } from '../../services/cache.service'; import { AdminPageRoutingModule } from './admin-page-routing.module'; import { AdminPageComponent } from './admin-page.component'; diff --git a/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts b/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts index 8c156c2f5..dfc854880 100644 --- a/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts +++ b/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { AnalysisPageComponent } from './analysis-page.component'; const routes: Routes = [ 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 839dc43c9..ac2304c66 100644 --- a/apps/client/src/app/pages/analysis/analysis-page.component.ts +++ b/apps/client/src/app/pages/analysis/analysis-page.component.ts @@ -1,4 +1,8 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +import { ToggleOption } from '@ghostfolio/client/app/components/toggle/interfaces/toggle-option.type'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { PortfolioItem } from 'apps/api/src/app/portfolio/interfaces/portfolio-item.interface'; import { PortfolioPosition } from 'apps/api/src/app/portfolio/interfaces/portfolio-position.interface'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; @@ -6,11 +10,6 @@ import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { ToggleOption } from '../../components/toggle/interfaces/toggle-option.type'; -import { DataService } from '../../services/data.service'; -import { ImpersonationStorageService } from '../../services/impersonation-storage.service'; -import { TokenStorageService } from '../../services/token-storage.service'; - @Component({ selector: 'gf-analysis-page', templateUrl: './analysis-page.html', diff --git a/apps/client/src/app/pages/analysis/analysis-page.module.ts b/apps/client/src/app/pages/analysis/analysis-page.module.ts index 8a15fa83d..ead2d929d 100644 --- a/apps/client/src/app/pages/analysis/analysis-page.module.ts +++ b/apps/client/src/app/pages/analysis/analysis-page.module.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatCardModule } from '@angular/material/card'; +import { GfInvestmentChartModule } from '@ghostfolio/client/app/components/investment-chart/investment-chart.module'; +import { PortfolioPositionsChartModule } from '@ghostfolio/client/app/components/portfolio-positions-chart/portfolio-positions-chart.module'; +import { PortfolioProportionChartModule } from '@ghostfolio/client/app/components/portfolio-proportion-chart/portfolio-proportion-chart.module'; +import { GfPositionsTableModule } from '@ghostfolio/client/app/components/positions-table/positions-table.module'; +import { GfToggleModule } from '@ghostfolio/client/app/components/toggle/toggle.module'; -import { GfInvestmentChartModule } from '../../components/investment-chart/investment-chart.module'; -import { PortfolioPositionsChartModule } from '../../components/portfolio-positions-chart/portfolio-positions-chart.module'; -import { PortfolioProportionChartModule } from '../../components/portfolio-proportion-chart/portfolio-proportion-chart.module'; -import { GfPositionsTableModule } from '../../components/positions-table/positions-table.module'; -import { GfToggleModule } from '../../components/toggle/toggle.module'; import { AnalysisPageRoutingModule } from './analysis-page-routing.module'; import { AnalysisPageComponent } from './analysis-page.component'; diff --git a/apps/client/src/app/pages/auth/auth-page.component.ts b/apps/client/src/app/pages/auth/auth-page.component.ts index b25be8fc5..dcb147ccd 100644 --- a/apps/client/src/app/pages/auth/auth-page.component.ts +++ b/apps/client/src/app/pages/auth/auth-page.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; - -import { TokenStorageService } from '../../services/token-storage.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; @Component({ selector: 'gf-auth-page', diff --git a/apps/client/src/app/pages/home/home-page-routing.module.ts b/apps/client/src/app/pages/home/home-page-routing.module.ts index ddde044f3..b82228252 100644 --- a/apps/client/src/app/pages/home/home-page-routing.module.ts +++ b/apps/client/src/app/pages/home/home-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { HomePageComponent } from './home-page.component'; const routes: Routes = [ 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 38a18592b..a3fce3daa 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -1,27 +1,26 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; +import { LineChartItem } from '@ghostfolio/client/app/components/line-chart/interfaces/line-chart.interface'; +import { PerformanceChartDialog } from '@ghostfolio/client/app/components/performance-chart-dialog/performance-chart-dialog.component'; +import { ToggleOption } from '@ghostfolio/client/app/components/toggle/interfaces/toggle-option.type'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service'; +import { + RANGE, + SettingsStorageService +} from '@ghostfolio/client/app/services/settings-storage.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { hasPermission, permissions } from '@ghostfolio/helper'; import { DateRange } from 'apps/api/src/app/portfolio/interfaces/date-range.type'; import { PortfolioOverview } from 'apps/api/src/app/portfolio/interfaces/portfolio-overview.interface'; import { PortfolioPerformance } from 'apps/api/src/app/portfolio/interfaces/portfolio-performance.interface'; import { PortfolioPosition } from 'apps/api/src/app/portfolio/interfaces/portfolio-position.interface'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; -import { - RANGE, - SettingsStorageService -} from 'apps/client/src/app/services/settings-storage.service'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { LineChartItem } from '../../components/line-chart/interfaces/line-chart.interface'; -import { PerformanceChartDialog } from '../../components/performance-chart-dialog/performance-chart-dialog.component'; -import { ToggleOption } from '../../components/toggle/interfaces/toggle-option.type'; -import { DataService } from '../../services/data.service'; -import { ImpersonationStorageService } from '../../services/impersonation-storage.service'; -import { TokenStorageService } from '../../services/token-storage.service'; - @Component({ selector: 'gf-home-page', templateUrl: './home-page.html', diff --git a/apps/client/src/app/pages/home/home-page.module.ts b/apps/client/src/app/pages/home/home-page.module.ts index dc86d2b9f..e583df515 100644 --- a/apps/client/src/app/pages/home/home-page.module.ts +++ b/apps/client/src/app/pages/home/home-page.module.ts @@ -3,14 +3,14 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { RouterModule } from '@angular/router'; +import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module'; +import { GfPerformanceChartDialogModule } from '@ghostfolio/client/app/components/performance-chart-dialog/performance-chart-dialog.module'; +import { GfPortfolioOverviewModule } from '@ghostfolio/client/app/components/portfolio-overview/portfolio-overview.module'; +import { GfPortfolioPerformanceSummaryModule } from '@ghostfolio/client/app/components/portfolio-performance-summary/portfolio-performance-summary.module'; +import { GfPortfolioPerformanceModule } from '@ghostfolio/client/app/components/portfolio-performance/portfolio-performance.module'; +import { GfPositionsModule } from '@ghostfolio/client/app/components/positions/positions.module'; +import { GfToggleModule } from '@ghostfolio/client/app/components/toggle/toggle.module'; -import { GfLineChartModule } from '../../components/line-chart/line-chart.module'; -import { GfPerformanceChartDialogModule } from '../../components/performance-chart-dialog/performance-chart-dialog.module'; -import { GfPortfolioOverviewModule } from '../../components/portfolio-overview/portfolio-overview.module'; -import { GfPortfolioPerformanceSummaryModule } from '../../components/portfolio-performance-summary/portfolio-performance-summary.module'; -import { GfPortfolioPerformanceModule } from '../../components/portfolio-performance/portfolio-performance.module'; -import { GfPositionsModule } from '../../components/positions/positions.module'; -import { GfToggleModule } from '../../components/toggle/toggle.module'; import { HomePageRoutingModule } from './home-page-routing.module'; import { HomePageComponent } from './home-page.component'; diff --git a/apps/client/src/app/pages/login/login-page-routing.module.ts b/apps/client/src/app/pages/login/login-page-routing.module.ts index 213e32637..9d95bf797 100644 --- a/apps/client/src/app/pages/login/login-page-routing.module.ts +++ b/apps/client/src/app/pages/login/login-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { LoginPageComponent } from './login-page.component'; const routes: Routes = [ diff --git a/apps/client/src/app/pages/login/login-page.component.ts b/apps/client/src/app/pages/login/login-page.component.ts index e7615008d..a7d42f058 100644 --- a/apps/client/src/app/pages/login/login-page.component.ts +++ b/apps/client/src/app/pages/login/login-page.component.ts @@ -1,14 +1,13 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; -import { hasPermission, permissions } from '@ghostfolio/helper'; +import { LineChartItem } from '@ghostfolio/client/app/components/line-chart/interfaces/line-chart.interface'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { format } from 'date-fns'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { LineChartItem } from '../../components/line-chart/interfaces/line-chart.interface'; -import { DataService } from '../../services/data.service'; -import { TokenStorageService } from '../../services/token-storage.service'; import { ShowAccessTokenDialog } from './show-access-token-dialog/show-access-token-dialog.component'; @Component({ diff --git a/apps/client/src/app/pages/login/login-page.module.ts b/apps/client/src/app/pages/login/login-page.module.ts index 5eb16eaaa..80215135f 100644 --- a/apps/client/src/app/pages/login/login-page.module.ts +++ b/apps/client/src/app/pages/login/login-page.module.ts @@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { RouterModule } from '@angular/router'; +import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module'; +import { GfLogoModule } from '@ghostfolio/client/app/components/logo/logo.module'; -import { GfLineChartModule } from '../../components/line-chart/line-chart.module'; -import { GfLogoModule } from '../../components/logo/logo.module'; import { LoginPageRoutingModule } from './login-page-routing.module'; import { LoginPageComponent } from './login-page.component'; import { ShowAccessTokenDialogModule } from './show-access-token-dialog/show-access-token-dialog.module'; diff --git a/apps/client/src/app/pages/report/report-page-routing.module.ts b/apps/client/src/app/pages/report/report-page-routing.module.ts index 0e5a41016..d89be9670 100644 --- a/apps/client/src/app/pages/report/report-page-routing.module.ts +++ b/apps/client/src/app/pages/report/report-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { ReportPageComponent } from './report-page.component'; const routes: Routes = [ diff --git a/apps/client/src/app/pages/report/report-page.component.ts b/apps/client/src/app/pages/report/report-page.component.ts index b0d0dca65..5246b40d6 100644 --- a/apps/client/src/app/pages/report/report-page.component.ts +++ b/apps/client/src/app/pages/report/report-page.component.ts @@ -1,10 +1,9 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; import { PortfolioReportRule } from 'apps/api/src/app/portfolio/interfaces/portfolio-report.interface'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { DataService } from '../../services/data.service'; - @Component({ selector: 'gf-report-page', templateUrl: './report-page.html', diff --git a/apps/client/src/app/pages/report/report-page.module.ts b/apps/client/src/app/pages/report/report-page.module.ts index 29585dd15..ac7c47bf1 100644 --- a/apps/client/src/app/pages/report/report-page.module.ts +++ b/apps/client/src/app/pages/report/report-page.module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { RulesModule } from 'apps/client/src/app/components/rules/rules.module'; +import { RulesModule } from '@ghostfolio/client/app/components/rules/rules.module'; import { ReportPageRoutingModule } from './report-page-routing.module'; import { ReportPageComponent } from './report-page.component'; diff --git a/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts b/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts index 3bfba31ef..a741a466d 100644 --- a/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts +++ b/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard'; -import { AuthGuard } from '../../core/auth.guard'; import { TransactionsPageComponent } from './transactions-page.component'; const routes: Routes = [ diff --git a/apps/client/src/app/pages/transactions/transactions-page.component.ts b/apps/client/src/app/pages/transactions/transactions-page.component.ts index 565afbd97..3c58b9d69 100644 --- a/apps/client/src/app/pages/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts @@ -1,6 +1,9 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; +import { DataService } from '@ghostfolio/client/app/services/data.service'; +import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service'; +import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service'; import { hasPermission, permissions } from '@ghostfolio/helper'; import { Order as OrderModel } from '@prisma/client'; import { UpdateOrderDto } from 'apps/api/src/app/order/update-order.dto'; @@ -9,9 +12,6 @@ import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { DataService } from '../../services/data.service'; -import { ImpersonationStorageService } from '../../services/impersonation-storage.service'; -import { TokenStorageService } from '../../services/token-storage.service'; import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.component'; @Component({ diff --git a/apps/client/src/app/pages/transactions/transactions-page.module.ts b/apps/client/src/app/pages/transactions/transactions-page.module.ts index 126868b76..b21344b0f 100644 --- a/apps/client/src/app/pages/transactions/transactions-page.module.ts +++ b/apps/client/src/app/pages/transactions/transactions-page.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { RouterModule } from '@angular/router'; +import { GfTransactionsTableModule } from '@ghostfolio/client/app/components/transactions-table/transactions-table.module'; -import { GfTransactionsTableModule } from '../../components/transactions-table/transactions-table.module'; import { CreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module'; import { TransactionsPageRoutingModule } from './transactions-page-routing.module'; import { TransactionsPageComponent } from './transactions-page.component'; diff --git a/tsconfig.base.json b/tsconfig.base.json index 584da9d8f..9adcb93ff 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -16,6 +16,8 @@ "skipDefaultLibCheck": true, "baseUrl": ".", "paths": { + "@ghostfolio/api/*": ["apps/api/src/*"], + "@ghostfolio/client/*": ["apps/client/src/*"], "@ghostfolio/helper": ["libs/helper/src/index.ts"] } },