From 0f2c8c856c5dc07318afbf4ab23ffb6545ca80cf Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Mon, 19 Apr 2021 14:38:55 +0200 Subject: [PATCH] Clean up imports (#24) --- apps/api/src/app/admin/admin.controller.ts | 2 +- apps/api/src/app/experimental/experimental.controller.ts | 7 +++++-- apps/api/src/app/order/order.controller.ts | 2 +- apps/api/src/app/portfolio/portfolio.controller.ts | 2 +- apps/api/src/app/user/user.controller.ts | 2 +- apps/api/src/app/user/user.service.ts | 8 ++++++-- apps/api/src/models/portfolio.spec.ts | 4 +--- apps/api/src/models/portfolio.ts | 2 +- apps/api/src/models/rule.ts | 2 +- apps/api/src/services/data-gathering.service.ts | 8 ++++++-- .../rakuten-rapid-api/rakuten-rapid-api.service.ts | 2 +- .../data-provider/yahoo-finance/yahoo-finance.service.ts | 2 +- apps/client/src/app/adapter/date-formats.ts | 2 +- apps/client/src/app/app.component.ts | 8 ++++++-- .../fear-and-greed-index.component.ts | 2 +- apps/client/src/app/components/header/header.component.ts | 2 +- .../investment-chart/investment-chart.component.ts | 2 +- .../src/app/components/line-chart/line-chart.component.ts | 2 +- .../portfolio-positions-chart.component.ts | 5 +---- .../position-detail-dialog.component.ts | 2 +- .../position-detail-dialog.module.ts | 2 +- .../client/src/app/components/position/position.module.ts | 4 ++-- .../components/positions-table/positions-table.module.ts | 4 ++-- .../transactions-table/transactions-table.component.ts | 2 +- .../transactions-table/transactions-table.module.ts | 4 ++-- apps/client/src/app/components/value/value.component.ts | 2 +- apps/client/src/app/pages/about/about-page.component.ts | 2 +- .../src/app/pages/account/account-page.component.ts | 2 +- apps/client/src/app/pages/admin/admin-page.component.ts | 2 +- apps/client/src/app/pages/home/home-page.component.ts | 2 +- .../app/pages/transactions/transactions-page.component.ts | 2 +- 31 files changed, 53 insertions(+), 43 deletions(-) diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.ts index bfeca840..1d4d7385 100644 --- a/apps/api/src/app/admin/admin.controller.ts +++ b/apps/api/src/app/admin/admin.controller.ts @@ -1,3 +1,4 @@ +import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Controller, Get, @@ -10,7 +11,6 @@ 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 { getPermissions, hasPermission, permissions } from 'libs/helper/src'; import { DataGatheringService } from '../../services/data-gathering.service'; import { AdminService } from './admin.service'; diff --git a/apps/api/src/app/experimental/experimental.controller.ts b/apps/api/src/app/experimental/experimental.controller.ts index 344a41c9..d9795e98 100644 --- a/apps/api/src/app/experimental/experimental.controller.ts +++ b/apps/api/src/app/experimental/experimental.controller.ts @@ -1,3 +1,8 @@ +import { + baseCurrency, + benchmarks, + isApiTokenAuthorized +} from '@ghostfolio/helper'; import { Body, Controller, @@ -12,8 +17,6 @@ import { REQUEST } from '@nestjs/core'; import { RequestWithUser } from 'apps/api/src/app/interfaces/request-with-user.type'; import { parse } from 'date-fns'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { baseCurrency, benchmarks } from 'libs/helper/src'; -import { isApiTokenAuthorized } from 'libs/helper/src'; import { CreateOrderDto } from './create-order.dto'; import { ExperimentalService } from './experimental.service'; diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index 6f5b1678..e62667f6 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -1,3 +1,4 @@ +import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Body, Controller, @@ -17,7 +18,6 @@ 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 { getPermissions, hasPermission, permissions } from 'libs/helper/src'; import { nullifyValuesInObjects } from '../../helper/object.helper'; import { ImpersonationService } from '../../services/impersonation.service'; diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index fe0319b5..0a997aa4 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -1,3 +1,4 @@ +import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Controller, Get, @@ -13,7 +14,6 @@ import { REQUEST } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; import { Response } from 'express'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { getPermissions, hasPermission, permissions } from 'libs/helper/src'; import { hasNotDefinedValuesInObject, diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts index 94b5ebe7..2f1ff0ab 100644 --- a/apps/api/src/app/user/user.controller.ts +++ b/apps/api/src/app/user/user.controller.ts @@ -1,3 +1,4 @@ +import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; import { Body, Controller, @@ -15,7 +16,6 @@ import { AuthGuard } from '@nestjs/passport'; import { Provider } from '@prisma/client'; import { RequestWithUser } from 'apps/api/src/app/interfaces/request-with-user.type'; import { StatusCodes, getReasonPhrase } from 'http-status-codes'; -import { getPermissions, hasPermission, permissions } from 'libs/helper/src'; import { UserItem } from './interfaces/user-item.interface'; import { User } from './interfaces/user.interface'; diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index bd4ac80a..82035da5 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -1,8 +1,12 @@ +import { + getPermissions, + locale, + permissions, + resetHours +} from '@ghostfolio/helper'; import { Injectable } from '@nestjs/common'; import { Currency, Prisma, Provider, User } from '@prisma/client'; import { add } from 'date-fns'; -import { locale, permissions, resetHours } from 'libs/helper/src'; -import { getPermissions } from 'libs/helper/src'; import { ConfigurationService } from '../../services/configuration.service'; import { PrismaService } from '../../services/prisma.service'; diff --git a/apps/api/src/models/portfolio.spec.ts b/apps/api/src/models/portfolio.spec.ts index fbaea932..01d2b39e 100644 --- a/apps/api/src/models/portfolio.spec.ts +++ b/apps/api/src/models/portfolio.spec.ts @@ -1,8 +1,6 @@ +import { baseCurrency, getUtc, getYesterday } from '@ghostfolio/helper'; import { Test } from '@nestjs/testing'; import { Currency, Role, Type } from '@prisma/client'; -import { baseCurrency } from 'libs/helper/src'; -import { getYesterday } from 'libs/helper/src'; -import { getUtc } from 'libs/helper/src'; import { ConfigurationService } from '../services/configuration.service'; import { DataProviderService } from '../services/data-provider.service'; diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts index df245218..4c73a45c 100644 --- a/apps/api/src/models/portfolio.ts +++ b/apps/api/src/models/portfolio.ts @@ -1,3 +1,4 @@ +import { getToday, getYesterday, resetHours } from '@ghostfolio/helper'; import { PortfolioItem, Position @@ -18,7 +19,6 @@ import { setMonth, sub } from 'date-fns'; -import { getToday, getYesterday, resetHours } from 'libs/helper/src'; import { cloneDeep, isEmpty } from 'lodash'; import * as roundTo from 'round-to'; diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.ts index 227cfac6..f5ffa77d 100644 --- a/apps/api/src/models/rule.ts +++ b/apps/api/src/models/rule.ts @@ -1,5 +1,5 @@ +import { groupBy } from '@ghostfolio/helper'; import { Currency } from '@prisma/client'; -import { groupBy } from 'libs/helper/src'; import { PortfolioPosition } from '../app/portfolio/interfaces/portfolio-position.interface'; import { ExchangeRateDataService } from '../services/exchange-rate-data.service'; diff --git a/apps/api/src/services/data-gathering.service.ts b/apps/api/src/services/data-gathering.service.ts index d403b83d..f6b438d2 100644 --- a/apps/api/src/services/data-gathering.service.ts +++ b/apps/api/src/services/data-gathering.service.ts @@ -1,3 +1,9 @@ +import { + benchmarks, + currencyPairs, + getUtc, + resetHours +} from '@ghostfolio/helper'; import { Injectable } from '@nestjs/common'; import { differenceInHours, @@ -8,8 +14,6 @@ import { isBefore, subDays } from 'date-fns'; -import { benchmarks, currencyPairs } from 'libs/helper/src'; -import { getUtc, resetHours } from 'libs/helper/src'; import { ConfigurationService } from './configuration.service'; import { DataProviderService } from './data-provider.service'; diff --git a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts index b5786674..dda897ce 100644 --- a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts +++ b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts @@ -1,7 +1,7 @@ +import { getToday, getYesterday } from '@ghostfolio/helper'; import { Injectable } from '@nestjs/common'; import * as bent from 'bent'; import { format, subMonths, subWeeks, subYears } from 'date-fns'; -import { getToday, getYesterday } from 'libs/helper/src'; import { ConfigurationService } from '../../configuration.service'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; 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 37bd8c9e..0cb68dca 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,6 +1,6 @@ +import { isCrypto, isCurrency, parseCurrency } from '@ghostfolio/helper'; import { Injectable } from '@nestjs/common'; import { format } from 'date-fns'; -import { isCrypto, isCurrency, parseCurrency } from 'libs/helper/src'; import * as yahooFinance from 'yahoo-finance'; import { DataProviderInterface } from '../../interfaces/data-provider.interface'; diff --git a/apps/client/src/app/adapter/date-formats.ts b/apps/client/src/app/adapter/date-formats.ts index 080c4542..66ba6eb4 100644 --- a/apps/client/src/app/adapter/date-formats.ts +++ b/apps/client/src/app/adapter/date-formats.ts @@ -1,7 +1,7 @@ import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_MONTH_YEAR -} from 'libs/helper/src'; +} from '@ghostfolio/helper'; export const DateFormats = { display: { diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index 6ee8ca95..1b2d4fa5 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -6,11 +6,15 @@ import { OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; +import { + hasPermission, + permissions, + primaryColorHex, + secondaryColorHex +} from '@ghostfolio/helper'; import { MaterialCssVarsService } from 'angular-material-css-vars'; import { InfoItem } from 'apps/api/src/app/info/interfaces/info-item.interface'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; -import { primaryColorHex, secondaryColorHex } from 'libs/helper/src'; -import { hasPermission, permissions } from 'libs/helper/src'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.ts b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.ts index 852af407..fa9c54f3 100644 --- a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.ts +++ b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.ts @@ -5,7 +5,7 @@ import { OnChanges, OnInit } from '@angular/core'; -import { resolveFearAndGreedIndex } from 'libs/helper/src'; +import { resolveFearAndGreedIndex } from '@ghostfolio/helper'; @Component({ selector: 'gf-fear-and-greed-index', diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts index 5640d73d..d0669463 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -6,9 +6,9 @@ import { } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; +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 { hasPermission, permissions } from 'libs/helper/src'; import { EMPTY, Subject } from 'rxjs'; import { catchError, takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index 8540448a..5a535983 100644 --- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts +++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts @@ -9,6 +9,7 @@ import { OnInit, ViewChild } from '@angular/core'; +import { primaryColorRgb } from '@ghostfolio/helper'; import { PortfolioItem } from 'apps/api/src/app/portfolio/interfaces/portfolio-item.interface'; import { LineController, @@ -18,7 +19,6 @@ import { TimeScale } from 'chart.js'; import { Chart } from 'chart.js'; -import { primaryColorRgb } from 'libs/helper/src'; @Component({ selector: 'gf-investment-chart', diff --git a/apps/client/src/app/components/line-chart/line-chart.component.ts b/apps/client/src/app/components/line-chart/line-chart.component.ts index 1a90b676..5c6b68a5 100644 --- a/apps/client/src/app/components/line-chart/line-chart.component.ts +++ b/apps/client/src/app/components/line-chart/line-chart.component.ts @@ -9,6 +9,7 @@ import { OnInit, ViewChild } from '@angular/core'; +import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/helper'; import { Chart, Filler, @@ -18,7 +19,6 @@ import { PointElement, TimeScale } from 'chart.js'; -import { primaryColorRgb, secondaryColorRgb } from 'libs/helper/src'; import { LineChartItem } from './interfaces/line-chart.interface'; diff --git a/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts b/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts index 5b7d4778..4fbfce57 100644 --- a/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts +++ b/apps/client/src/app/components/portfolio-positions-chart/portfolio-positions-chart.component.ts @@ -5,13 +5,10 @@ import { Component, Input, OnChanges, - OnInit, - ViewChild + OnInit } from '@angular/core'; import { PortfolioItem } from 'apps/api/src/app/portfolio/interfaces/portfolio-item.interface'; -import { Chart } from 'chart.js'; import { endOfDay, parseISO, startOfDay } from 'date-fns'; -import { primaryColorRgb } from 'libs/helper/src'; @Component({ selector: 'gf-portfolio-positions-chart', 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 b16ab0c8..0cee091d 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 @@ -13,7 +13,7 @@ import { PositionDetailDialogParams } from './interfaces/interfaces'; @Component({ host: { class: 'd-flex flex-column h-100' }, - selector: 'position-detail-dialog', + selector: 'gf-position-detail-dialog', changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: 'position-detail-dialog.html', styleUrls: ['./position-detail-dialog.component.scss'] 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 b2f813f4..21ac8535 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 @@ -26,4 +26,4 @@ import { PositionDetailDialog } from './position-detail-dialog.component'; providers: [], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class PositionDetailDialogModule {} +export class GfPositionDetailDialogModule {} diff --git a/apps/client/src/app/components/position/position.module.ts b/apps/client/src/app/components/position/position.module.ts index 933029a1..15e41104 100644 --- a/apps/client/src/app/components/position/position.module.ts +++ b/apps/client/src/app/components/position/position.module.ts @@ -7,7 +7,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; import { GfTrendIndicatorModule } from '../trend-indicator/trend-indicator.module'; import { GfValueModule } from '../value/value.module'; -import { PositionDetailDialogModule } from './position-detail-dialog/position-detail-dialog.module'; +import { GfPositionDetailDialogModule } from './position-detail-dialog/position-detail-dialog.module'; import { PositionComponent } from './position.component'; @NgModule({ @@ -15,12 +15,12 @@ import { PositionComponent } from './position.component'; exports: [PositionComponent], imports: [ CommonModule, + GfPositionDetailDialogModule, GfSymbolIconModule, GfTrendIndicatorModule, GfValueModule, MatDialogModule, NgxSkeletonLoaderModule, - PositionDetailDialogModule, RouterModule ], providers: [], diff --git a/apps/client/src/app/components/positions-table/positions-table.module.ts b/apps/client/src/app/components/positions-table/positions-table.module.ts index 943df892..67765803 100644 --- a/apps/client/src/app/components/positions-table/positions-table.module.ts +++ b/apps/client/src/app/components/positions-table/positions-table.module.ts @@ -10,7 +10,7 @@ import { RouterModule } from '@angular/router'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { GfNoTransactionsInfoModule } from '../no-transactions-info/no-transactions-info.module'; -import { PositionDetailDialogModule } from '../position/position-detail-dialog/position-detail-dialog.module'; +import { GfPositionDetailDialogModule } from '../position/position-detail-dialog/position-detail-dialog.module'; import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; import { GfValueModule } from '../value/value.module'; import { PositionsTableComponent } from './positions-table.component'; @@ -21,6 +21,7 @@ import { PositionsTableComponent } from './positions-table.component'; imports: [ CommonModule, GfNoTransactionsInfoModule, + GfPositionDetailDialogModule, GfSymbolIconModule, GfValueModule, MatButtonModule, @@ -30,7 +31,6 @@ import { PositionsTableComponent } from './positions-table.component'; MatSortModule, MatTableModule, NgxSkeletonLoaderModule, - PositionDetailDialogModule, RouterModule ], providers: [], diff --git a/apps/client/src/app/components/transactions-table/transactions-table.component.ts b/apps/client/src/app/components/transactions-table/transactions-table.component.ts index 8da3a746..05b69520 100644 --- a/apps/client/src/app/components/transactions-table/transactions-table.component.ts +++ b/apps/client/src/app/components/transactions-table/transactions-table.component.ts @@ -13,8 +13,8 @@ import { MatDialog } from '@angular/material/dialog'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute, Router } from '@angular/router'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; import { Order as OrderModel } from '@prisma/client'; -import { DEFAULT_DATE_FORMAT } from 'libs/helper/src'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/transactions-table/transactions-table.module.ts b/apps/client/src/app/components/transactions-table/transactions-table.module.ts index f5e80fd2..0623ccd1 100644 --- a/apps/client/src/app/components/transactions-table/transactions-table.module.ts +++ b/apps/client/src/app/components/transactions-table/transactions-table.module.ts @@ -8,7 +8,7 @@ import { MatTableModule } from '@angular/material/table'; import { RouterModule } from '@angular/router'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { PositionDetailDialogModule } from '../position/position-detail-dialog/position-detail-dialog.module'; +import { GfPositionDetailDialogModule } from '../position/position-detail-dialog/position-detail-dialog.module'; import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; import { GfValueModule } from '../value/value.module'; import { TransactionsTableComponent } from './transactions-table.component'; @@ -18,6 +18,7 @@ import { TransactionsTableComponent } from './transactions-table.component'; exports: [TransactionsTableComponent], imports: [ CommonModule, + GfPositionDetailDialogModule, GfSymbolIconModule, GfValueModule, MatButtonModule, @@ -26,7 +27,6 @@ import { TransactionsTableComponent } from './transactions-table.component'; MatSortModule, MatTableModule, NgxSkeletonLoaderModule, - PositionDetailDialogModule, RouterModule ], providers: [], diff --git a/apps/client/src/app/components/value/value.component.ts b/apps/client/src/app/components/value/value.component.ts index e12ab6c4..875191d3 100644 --- a/apps/client/src/app/components/value/value.component.ts +++ b/apps/client/src/app/components/value/value.component.ts @@ -5,8 +5,8 @@ import { OnChanges, OnInit } from '@angular/core'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; import { format, isDate } from 'date-fns'; -import { DEFAULT_DATE_FORMAT } from 'libs/helper/src'; import { isNumber } from 'lodash'; @Component({ 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 b8e115a3..0bbd9426 100644 --- a/apps/client/src/app/pages/about/about-page.component.ts +++ b/apps/client/src/app/pages/about/about-page.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +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 { baseCurrency } from 'libs/helper/src'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; 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 353e2ac2..605eaf70 100644 --- a/apps/client/src/app/pages/account/account-page.component.ts +++ b/apps/client/src/app/pages/account/account-page.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +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 { DEFAULT_DATE_FORMAT } from 'libs/helper/src'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; 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 de2c163d..16cc969e 100644 --- a/apps/client/src/app/pages/admin/admin-page.component.ts +++ b/apps/client/src/app/pages/admin/admin-page.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +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 { DEFAULT_DATE_FORMAT } from 'libs/helper/src'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts index 48e1ed79..a6b9e593 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; +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'; @@ -10,7 +11,6 @@ import { RANGE, SettingsStorageService } from 'apps/client/src/app/services/settings-storage.service'; -import { hasPermission, permissions } from 'libs/helper/src'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; 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 b710b01c..565afbd9 100644 --- a/apps/client/src/app/pages/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; +import { hasPermission, permissions } from '@ghostfolio/helper'; import { Order as OrderModel } from '@prisma/client'; import { UpdateOrderDto } from 'apps/api/src/app/order/update-order.dto'; import { User } from 'apps/api/src/app/user/interfaces/user.interface'; -import { hasPermission, permissions } from 'libs/helper/src'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators';