From b4b9478904e7db7d74fb55311f8bd64c1a0576ae Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sun, 16 May 2021 12:12:53 +0200 Subject: [PATCH] Reorganize helper lib --- apps/api/src/app/access/access.controller.ts | 2 +- apps/api/src/app/account/account.controller.ts | 6 +++++- apps/api/src/app/admin/admin.controller.ts | 6 +++++- apps/api/src/app/experimental/experimental.controller.ts | 7 ++----- apps/api/src/app/info/info.service.ts | 2 +- apps/api/src/app/order/order.controller.ts | 6 +++++- apps/api/src/app/portfolio/portfolio.controller.ts | 6 +++++- apps/api/src/app/user/user.controller.ts | 6 +++++- apps/api/src/app/user/user.service.ts | 9 +++------ apps/api/src/models/portfolio.spec.ts | 2 +- apps/api/src/models/portfolio.ts | 8 ++------ apps/api/src/models/rule.ts | 2 +- apps/api/src/services/data-gathering.service.ts | 5 ++--- apps/api/src/services/data-provider.service.ts | 2 +- .../ghostfolio-scraper-api.service.ts | 2 +- .../rakuten-rapid-api/rakuten-rapid-api.service.ts | 2 +- .../data-provider/yahoo-finance/yahoo-finance.service.ts | 8 ++------ apps/api/src/services/exchange-rate-data.service.ts | 2 +- apps/api/src/services/interfaces/interfaces.ts | 2 +- apps/client/src/app/adapter/date-formats.ts | 2 +- apps/client/src/app/app.component.ts | 8 ++------ .../components/access-table/access-table.component.ts | 2 +- .../fear-and-greed-index.component.ts | 2 +- .../client/src/app/components/header/header.component.ts | 2 +- .../investment-chart/investment-chart.component.ts | 2 +- .../app/components/line-chart/line-chart.component.ts | 7 ++----- .../portfolio-proportion-chart.component.ts | 3 ++- .../src/app/components/position/position.component.ts | 2 +- .../transactions-table/transactions-table.component.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 | 9 +++------ .../src/app/pages/accounts/accounts-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 +- .../src/app/pages/pricing/pricing-page.component.ts | 2 +- .../pages/transactions/transactions-page.component.ts | 2 +- apps/client/src/app/pipes/symbol/symbol.pipe.ts | 2 +- apps/client/src/app/services/data.service.ts | 2 +- libs/helper/src/index.ts | 3 --- .../helper/src/lib}/interfaces/access.interface.ts | 0 libs/helper/src/lib/interfaces/index.ts | 3 +++ tsconfig.base.json | 2 +- 43 files changed, 75 insertions(+), 79 deletions(-) delete mode 100644 libs/helper/src/index.ts rename {apps/api/src/app/access => libs/helper/src/lib}/interfaces/access.interface.ts (100%) create mode 100644 libs/helper/src/lib/interfaces/index.ts diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts index 469b66b7c..2d9b0c28f 100644 --- a/apps/api/src/app/access/access.controller.ts +++ b/apps/api/src/app/access/access.controller.ts @@ -1,10 +1,10 @@ import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; +import { Access } from '@ghostfolio/helper/interfaces'; import { Controller, Get, Inject, UseGuards } from '@nestjs/common'; import { REQUEST } from '@nestjs/core'; import { AuthGuard } from '@nestjs/passport'; import { AccessService } from './access.service'; -import { Access } from './interfaces/access.interface'; @Controller('access') export class AccessController { diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.ts index 78a1a416b..d33e07eea 100644 --- a/apps/api/src/app/account/account.controller.ts +++ b/apps/api/src/app/account/account.controller.ts @@ -1,7 +1,11 @@ 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 { + getPermissions, + hasPermission, + permissions +} from '@ghostfolio/helper/permissions'; import { Body, Controller, diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.ts index 0ae58bae1..ee1c4fdfd 100644 --- a/apps/api/src/app/admin/admin.controller.ts +++ b/apps/api/src/app/admin/admin.controller.ts @@ -1,6 +1,10 @@ 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 { + getPermissions, + hasPermission, + permissions +} from '@ghostfolio/helper/permissions'; import { Controller, Get, diff --git a/apps/api/src/app/experimental/experimental.controller.ts b/apps/api/src/app/experimental/experimental.controller.ts index 88a24adc0..5534d7531 100644 --- a/apps/api/src/app/experimental/experimental.controller.ts +++ b/apps/api/src/app/experimental/experimental.controller.ts @@ -1,9 +1,6 @@ import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; -import { - baseCurrency, - benchmarks, - isApiTokenAuthorized -} from '@ghostfolio/helper'; +import { baseCurrency, benchmarks } from '@ghostfolio/helper/config'; +import { isApiTokenAuthorized } from '@ghostfolio/helper/permissions'; import { Body, Controller, diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts index 171d0d509..f3e19c81f 100644 --- a/apps/api/src/app/info/info.service.ts +++ b/apps/api/src/app/info/info.service.ts @@ -1,6 +1,6 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { PrismaService } from '@ghostfolio/api/services/prisma.service'; -import { permissions } from '@ghostfolio/helper'; +import { permissions } from '@ghostfolio/helper/permissions'; import { Injectable } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; import { Currency } from '@prisma/client'; diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index c51a7ffe6..3c62dc21a 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -1,7 +1,11 @@ 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 { + getPermissions, + hasPermission, + permissions +} from '@ghostfolio/helper/permissions'; import { Body, Controller, diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index de5f9bf92..c4c9d677c 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -4,7 +4,11 @@ import { } 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 { + getPermissions, + hasPermission, + permissions +} from '@ghostfolio/helper/permissions'; import { Controller, Get, diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts index f7f78087e..a12eb1939 100644 --- a/apps/api/src/app/user/user.controller.ts +++ b/apps/api/src/app/user/user.controller.ts @@ -1,5 +1,9 @@ import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type'; -import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper'; +import { + getPermissions, + hasPermission, + permissions +} from '@ghostfolio/helper/permissions'; import { Body, Controller, diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 34d34cac9..9691a3e45 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -1,11 +1,8 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.service'; import { PrismaService } from '@ghostfolio/api/services/prisma.service'; -import { - getPermissions, - locale, - permissions, - resetHours -} from '@ghostfolio/helper'; +import { locale } from '@ghostfolio/helper/config'; +import { resetHours } from '@ghostfolio/helper/helper'; +import { getPermissions, permissions } from '@ghostfolio/helper/permissions'; import { Injectable } from '@nestjs/common'; import { Currency, Prisma, Provider, User } from '@prisma/client'; import { add } from 'date-fns'; diff --git a/apps/api/src/models/portfolio.spec.ts b/apps/api/src/models/portfolio.spec.ts index ef19fde68..80d684a5d 100644 --- a/apps/api/src/models/portfolio.spec.ts +++ b/apps/api/src/models/portfolio.spec.ts @@ -5,13 +5,13 @@ import { getYesterday } from '@ghostfolio/helper'; import { AccountType, Currency, DataSource, Role, Type } from '@prisma/client'; +import { format } from 'date-fns'; import { DataProviderService } from '../services/data-provider.service'; import { ExchangeRateDataService } from '../services/exchange-rate-data.service'; import { MarketState } from '../services/interfaces/interfaces'; import { RulesService } from '../services/rules.service'; import { Portfolio } from './portfolio'; -import { format } from 'date-fns'; jest.mock('../services/data-provider.service', () => { return { diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts index 3451bd63c..d2f99e2ac 100644 --- a/apps/api/src/models/portfolio.ts +++ b/apps/api/src/models/portfolio.ts @@ -2,12 +2,8 @@ import { PortfolioItem, Position } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; -import { - UNKNOWN_KEY, - getToday, - getYesterday, - resetHours -} from '@ghostfolio/helper'; +import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; +import { getToday, getYesterday, resetHours } from '@ghostfolio/helper/helper'; import { add, format, diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.ts index f5ffa77d3..1abc97182 100644 --- a/apps/api/src/models/rule.ts +++ b/apps/api/src/models/rule.ts @@ -1,4 +1,4 @@ -import { groupBy } from '@ghostfolio/helper'; +import { groupBy } from '@ghostfolio/helper/helper'; import { Currency } from '@prisma/client'; import { PortfolioPosition } from '../app/portfolio/interfaces/portfolio-position.interface'; diff --git a/apps/api/src/services/data-gathering.service.ts b/apps/api/src/services/data-gathering.service.ts index bdbd2d7d0..8b4fa1312 100644 --- a/apps/api/src/services/data-gathering.service.ts +++ b/apps/api/src/services/data-gathering.service.ts @@ -1,10 +1,9 @@ +import { benchmarks, currencyPairs } from '@ghostfolio/helper/config'; import { - benchmarks, - currencyPairs, getUtc, isGhostfolioScraperApiSymbol, resetHours -} from '@ghostfolio/helper'; +} from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { differenceInHours, diff --git a/apps/api/src/services/data-provider.service.ts b/apps/api/src/services/data-provider.service.ts index 827b22946..8fb9d7ea3 100644 --- a/apps/api/src/services/data-provider.service.ts +++ b/apps/api/src/services/data-provider.service.ts @@ -2,7 +2,7 @@ import { isCrypto, isGhostfolioScraperApiSymbol, isRakutenRapidApiSymbol -} from '@ghostfolio/helper'; +} from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { MarketData } from '@prisma/client'; import { format } from 'date-fns'; diff --git a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts index c1856b29c..92bc19f5e 100644 --- a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts +++ b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts @@ -1,4 +1,4 @@ -import { getYesterday } from '@ghostfolio/helper'; +import { getYesterday } from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import * as bent from 'bent'; 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 addcd685e..b8c0dd3ff 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,4 +1,4 @@ -import { getToday, getYesterday } from '@ghostfolio/helper'; +import { getToday, getYesterday } from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import * as bent from 'bent'; 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 1976a0522..531a10b07 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,9 +1,5 @@ -import { - UNKNOWN_KEY, - isCrypto, - isCurrency, - parseCurrency -} from '@ghostfolio/helper'; +import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; +import { isCrypto, isCurrency, parseCurrency } from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { DataSource } from '@prisma/client'; import { format } from 'date-fns'; diff --git a/apps/api/src/services/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data.service.ts index 9f14a6396..96970128c 100644 --- a/apps/api/src/services/exchange-rate-data.service.ts +++ b/apps/api/src/services/exchange-rate-data.service.ts @@ -1,4 +1,4 @@ -import { getYesterday } from '@ghostfolio/helper'; +import { getYesterday } from '@ghostfolio/helper/helper'; import { Injectable } from '@nestjs/common'; import { Currency } from '@prisma/client'; import { format } from 'date-fns'; diff --git a/apps/api/src/services/interfaces/interfaces.ts b/apps/api/src/services/interfaces/interfaces.ts index 904eaae79..97678f4cc 100644 --- a/apps/api/src/services/interfaces/interfaces.ts +++ b/apps/api/src/services/interfaces/interfaces.ts @@ -1,4 +1,4 @@ -import { UNKNOWN_KEY } from '@ghostfolio/helper'; +import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; import { Account, Currency, DataSource } from '@prisma/client'; import { OrderType } from '../../models/order-type'; diff --git a/apps/client/src/app/adapter/date-formats.ts b/apps/client/src/app/adapter/date-formats.ts index 66ba6eb43..62373944f 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 '@ghostfolio/helper'; +} from '@ghostfolio/helper/config'; export const DateFormats = { display: { diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index d6322f738..782c64309 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -8,12 +8,8 @@ import { import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router'; import { InfoItem } from '@ghostfolio/api/app/info/interfaces/info-item.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; -import { - hasPermission, - permissions, - primaryColorHex, - secondaryColorHex -} from '@ghostfolio/helper'; +import { primaryColorHex, secondaryColorHex } from '@ghostfolio/helper/config'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { MaterialCssVarsService } from 'angular-material-css-vars'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts index b7004baa8..ab7475070 100644 --- a/apps/client/src/app/components/access-table/access-table.component.ts +++ b/apps/client/src/app/components/access-table/access-table.component.ts @@ -6,7 +6,7 @@ import { OnInit } from '@angular/core'; import { MatTableDataSource } from '@angular/material/table'; -import { Access } from '@ghostfolio/api/app/access/interfaces/access.interface'; +import { Access } from '@ghostfolio/helper/interfaces'; @Component({ selector: 'gf-access-table', 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 fa9c54f3c..12f5f7b3e 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 '@ghostfolio/helper'; +import { resolveFearAndGreedIndex } from '@ghostfolio/helper/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 b74c7061a..ea1cf4889 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -12,7 +12,7 @@ import { LoginWithAccessTokenDialog } from '@ghostfolio/client/pages/login/login import { DataService } from '@ghostfolio/client/services/data.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { hasPermission, permissions } from '@ghostfolio/helper'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { EMPTY, Subject } from 'rxjs'; import { catchError, takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index d90f5b1eb..ac7317445 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 @@ -10,7 +10,7 @@ import { ViewChild } from '@angular/core'; import { PortfolioItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-item.interface'; -import { primaryColorRgb } from '@ghostfolio/helper'; +import { primaryColorRgb } from '@ghostfolio/helper/config'; import { LineController, LineElement, 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 5614ed25d..c5e8ea0a0 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,11 +9,8 @@ import { OnInit, ViewChild } from '@angular/core'; -import { - getBackgroundColor, - primaryColorRgb, - secondaryColorRgb -} from '@ghostfolio/helper'; +import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/helper/config'; +import { getBackgroundColor } from '@ghostfolio/helper/helper'; import { Chart, Filler, diff --git a/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts index b970ffd5c..7326d6096 100644 --- a/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts +++ b/apps/client/src/app/components/portfolio-proportion-chart/portfolio-proportion-chart.component.ts @@ -8,7 +8,8 @@ import { ViewChild } from '@angular/core'; import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; -import { UNKNOWN_KEY, getCssVariable, getTextColor } from '@ghostfolio/helper'; +import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; +import { getCssVariable, getTextColor } from '@ghostfolio/helper/helper'; import { Currency } from '@prisma/client'; import { Tooltip } from 'chart.js'; import { LinearScale } from 'chart.js'; diff --git a/apps/client/src/app/components/position/position.component.ts b/apps/client/src/app/components/position/position.component.ts index 360a14798..47bca6504 100644 --- a/apps/client/src/app/components/position/position.component.ts +++ b/apps/client/src/app/components/position/position.component.ts @@ -8,7 +8,7 @@ import { import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router } from '@angular/router'; import { PortfolioPosition } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position.interface'; -import { UNKNOWN_KEY } from '@ghostfolio/helper'; +import { UNKNOWN_KEY } from '@ghostfolio/helper/config'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; 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 c5edc5421..5b18561ed 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 @@ -22,8 +22,8 @@ import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute, Router } from '@angular/router'; import { OrderWithAccount } from '@ghostfolio/api/app/order/interfaces/order-with-account.type'; -import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; -import { format, parse, parseISO } from 'date-fns'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper/config'; +import { format } from 'date-fns'; import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/components/value/value.component.ts b/apps/client/src/app/components/value/value.component.ts index 875191d3b..0ff93735d 100644 --- a/apps/client/src/app/components/value/value.component.ts +++ b/apps/client/src/app/components/value/value.component.ts @@ -5,7 +5,7 @@ import { OnChanges, OnInit } from '@angular/core'; -import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper/config'; import { format, isDate } from 'date-fns'; import { isNumber } from 'lodash'; 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 4a677a9ee..44101f357 100644 --- a/apps/client/src/app/pages/about/about-page.component.ts +++ b/apps/client/src/app/pages/about/about-page.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { baseCurrency } from '@ghostfolio/helper'; +import { baseCurrency } from '@ghostfolio/helper/config'; 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 e1bd78000..4ed1a15be 100644 --- a/apps/client/src/app/pages/account/account-page.component.ts +++ b/apps/client/src/app/pages/account/account-page.component.ts @@ -1,13 +1,10 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { Access } from '@ghostfolio/api/app/access/interfaces/access.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { - DEFAULT_DATE_FORMAT, - hasPermission, - permissions -} from '@ghostfolio/helper'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper/config'; +import { Access } from '@ghostfolio/helper/interfaces/access.interface'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { Currency } from '@prisma/client'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.ts index 8c9fa0349..1207d15cc 100644 --- a/apps/client/src/app/pages/accounts/accounts-page.component.ts +++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts @@ -7,7 +7,7 @@ import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { hasPermission, permissions } from '@ghostfolio/helper'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { Account as AccountModel, AccountType } from '@prisma/client'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; 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 d00a28d0e..7a9d20c58 100644 --- a/apps/client/src/app/pages/admin/admin-page.component.ts +++ b/apps/client/src/app/pages/admin/admin-page.component.ts @@ -5,7 +5,7 @@ import { AdminService } from '@ghostfolio/client/services/admin.service'; import { CacheService } from '@ghostfolio/client/services/cache.service'; import { DataService } from '@ghostfolio/client/services/data.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; +import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper/config'; import { formatDistanceToNow, isValid, parseISO, sub } from 'date-fns'; 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 d91c3a7ad..43b3e8e16 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -16,7 +16,7 @@ import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { hasPermission, permissions } from '@ghostfolio/helper'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/pages/pricing/pricing-page.component.ts b/apps/client/src/app/pages/pricing/pricing-page.component.ts index 62b2933b1..e73578760 100644 --- a/apps/client/src/app/pages/pricing/pricing-page.component.ts +++ b/apps/client/src/app/pages/pricing/pricing-page.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { baseCurrency } from '@ghostfolio/helper'; +import { baseCurrency } from '@ghostfolio/helper/config'; import { Subject } 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 1fbb17023..d38932d77 100644 --- a/apps/client/src/app/pages/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts @@ -7,7 +7,7 @@ import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; -import { hasPermission, permissions } from '@ghostfolio/helper'; +import { hasPermission, permissions } from '@ghostfolio/helper/permissions'; import { Order as OrderModel } from '@prisma/client'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; diff --git a/apps/client/src/app/pipes/symbol/symbol.pipe.ts b/apps/client/src/app/pipes/symbol/symbol.pipe.ts index 0c4c4a390..71af05ed3 100644 --- a/apps/client/src/app/pipes/symbol/symbol.pipe.ts +++ b/apps/client/src/app/pipes/symbol/symbol.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ghostfolioScraperApiSymbolPrefix } from '@ghostfolio/helper'; +import { ghostfolioScraperApiSymbolPrefix } from '@ghostfolio/helper/config'; @Pipe({ name: 'gfSymbol' }) export class SymbolPipe implements PipeTransform { diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index fb69eaf6e..25bf006f4 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -1,6 +1,5 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Access } from '@ghostfolio/api/app/access/interfaces/access.interface'; import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto'; import { UpdateAccountDto } from '@ghostfolio/api/app/account/update-account.dto'; import { AdminData } from '@ghostfolio/api/app/admin/interfaces/admin-data.interface'; @@ -21,6 +20,7 @@ import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.in import { UserItem } from '@ghostfolio/api/app/user/interfaces/user-item.interface'; import { User } from '@ghostfolio/api/app/user/interfaces/user.interface'; import { UpdateUserSettingsDto } from '@ghostfolio/api/app/user/update-user-settings.dto'; +import { Access } from '@ghostfolio/helper/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Account as AccountModel } from '@prisma/client'; import { parseISO } from 'date-fns'; diff --git a/libs/helper/src/index.ts b/libs/helper/src/index.ts deleted file mode 100644 index fe49f940b..000000000 --- a/libs/helper/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './lib/config'; -export * from './lib/helper'; -export * from './lib/permissions'; diff --git a/apps/api/src/app/access/interfaces/access.interface.ts b/libs/helper/src/lib/interfaces/access.interface.ts similarity index 100% rename from apps/api/src/app/access/interfaces/access.interface.ts rename to libs/helper/src/lib/interfaces/access.interface.ts diff --git a/libs/helper/src/lib/interfaces/index.ts b/libs/helper/src/lib/interfaces/index.ts new file mode 100644 index 000000000..a39c7aaa7 --- /dev/null +++ b/libs/helper/src/lib/interfaces/index.ts @@ -0,0 +1,3 @@ +import { Access } from './access.interface'; + +export { Access }; diff --git a/tsconfig.base.json b/tsconfig.base.json index cc4def900..fac4a76af 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,7 +18,7 @@ "paths": { "@ghostfolio/api/*": ["apps/api/src/*"], "@ghostfolio/client/*": ["apps/client/src/app/*"], - "@ghostfolio/helper": ["libs/helper/src/index.ts"] + "@ghostfolio/helper/*": ["libs/helper/src/lib/*"] } }, "exclude": ["node_modules", "tmp"]