Improve imports

apps/client/src/app/components/header/header.component.ts

@@ -6,10 +6,10 @@ 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 { LoginWithAccessTokenDialog } from '@ghostfolio/client/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component';
+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 { InfoItem } from 'apps/api/src/app/info/interfaces/info-item.interface';
 import { User } from 'apps/api/src/app/user/interfaces/user.interface';

apps/client/src/app/components/header/header.module.ts

@@ -4,7 +4,7 @@ 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 '@ghostfolio/client/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.module';
 
 import { GfLogoModule } from '../logo/logo.module';
 import { HeaderComponent } from './header.component';

apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts

@@ -5,7 +5,7 @@ import {
   Inject
 } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { isToday, parse } from 'date-fns';
 
 import { LineChartItem } from '../line-chart/interfaces/line-chart.interface';

apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts

@@ -2,7 +2,7 @@ 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 { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { GfDialogFooterModule } from '../dialog-footer/dialog-footer.module';

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts

@@ -5,7 +5,7 @@ import {
   Inject
 } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { format, isSameMonth, isToday, parseISO } from 'date-fns';
 
 import { LineChartItem } from '../../line-chart/interfaces/line-chart.interface';

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.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 { MatDialogModule } from '@angular/material/dialog';
-import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { GfDialogFooterModule } from '../../dialog-footer/dialog-footer.module';

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 '@ghostfolio/client/app/components/rule/rule.module';
+import { GfRuleModule } from '@ghostfolio/client/components/rule/rule.module';
 
 import { GfNoTransactionsInfoModule } from '../no-transactions-info/no-transactions-info.module';
 import { GfPositionModule } from '../position/position.module';

apps/client/src/app/pages/about/about-page.component.ts

@@ -1,6 +1,6 @@
 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 { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/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';

apps/client/src/app/pages/account/account-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AccountPageComponent } from './account-page.component';
 

apps/client/src/app/pages/account/account-page.component.ts

@@ -1,6 +1,6 @@
 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 { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/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';

apps/client/src/app/pages/account/account-page.module.ts

@@ -4,7 +4,7 @@ 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 '@ghostfolio/client/components/access-table/access-table.module';
 
 import { AccountPageRoutingModule } from './account-page-routing.module';
 import { AccountPageComponent } from './account-page.component';

apps/client/src/app/pages/admin/admin-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AdminPageComponent } from './admin-page.component';
 

apps/client/src/app/pages/admin/admin-page.component.ts

@@ -1,7 +1,7 @@
 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 { AdminService } from '@ghostfolio/client/services/admin.service';
+import { CacheService } from '@ghostfolio/client/services/cache.service';
+import { DataService } from '@ghostfolio/client/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';

apps/client/src/app/pages/admin/admin-page.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 { CacheService } from '@ghostfolio/client/app/services/cache.service';
+import { CacheService } from '@ghostfolio/client/services/cache.service';
 
 import { AdminPageRoutingModule } from './admin-page-routing.module';
 import { AdminPageComponent } from './admin-page.component';

apps/client/src/app/pages/analysis/analysis-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AnalysisPageComponent } from './analysis-page.component';
 

apps/client/src/app/pages/analysis/analysis-page.component.ts

@@ -1,8 +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 { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type';
+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 { 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';

apps/client/src/app/pages/analysis/analysis-page.module.ts

@@ -1,11 +1,11 @@
 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 '@ghostfolio/client/components/investment-chart/investment-chart.module';
+import { PortfolioPositionsChartModule } from '@ghostfolio/client/components/portfolio-positions-chart/portfolio-positions-chart.module';
+import { PortfolioProportionChartModule } from '@ghostfolio/client/components/portfolio-proportion-chart/portfolio-proportion-chart.module';
+import { GfPositionsTableModule } from '@ghostfolio/client/components/positions-table/positions-table.module';
+import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
 
 import { AnalysisPageRoutingModule } from './analysis-page-routing.module';
 import { AnalysisPageComponent } from './analysis-page.component';

apps/client/src/app/pages/auth/auth-page.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 
 @Component({
   selector: 'gf-auth-page',

apps/client/src/app/pages/home/home-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { HomePageComponent } from './home-page.component';
 

apps/client/src/app/pages/home/home-page.component.ts

@@ -1,16 +1,16 @@
 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 { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface';
+import { PerformanceChartDialog } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.component';
+import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/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';
+} from '@ghostfolio/client/services/settings-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/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';

apps/client/src/app/pages/home/home-page.module.ts

@@ -3,13 +3,13 @@ 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 '@ghostfolio/client/components/line-chart/line-chart.module';
+import { GfPerformanceChartDialogModule } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.module';
+import { GfPortfolioOverviewModule } from '@ghostfolio/client/components/portfolio-overview/portfolio-overview.module';
+import { GfPortfolioPerformanceSummaryModule } from '@ghostfolio/client/components/portfolio-performance-summary/portfolio-performance-summary.module';
+import { GfPortfolioPerformanceModule } from '@ghostfolio/client/components/portfolio-performance/portfolio-performance.module';
+import { GfPositionsModule } from '@ghostfolio/client/components/positions/positions.module';
+import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
 
 import { HomePageRoutingModule } from './home-page-routing.module';
 import { HomePageComponent } from './home-page.component';

apps/client/src/app/pages/login/login-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { LoginPageComponent } from './login-page.component';
 

apps/client/src/app/pages/login/login-page.component.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-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 { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { format } from 'date-fns';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

apps/client/src/app/pages/login/login-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 { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
-import { GfLogoModule } from '@ghostfolio/client/app/components/logo/logo.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
+import { GfLogoModule } from '@ghostfolio/client/components/logo/logo.module';
 
 import { LoginPageRoutingModule } from './login-page-routing.module';
 import { LoginPageComponent } from './login-page.component';

apps/client/src/app/pages/report/report-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { ReportPageComponent } from './report-page.component';
 

apps/client/src/app/pages/report/report-page.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { PortfolioReportRule } from 'apps/api/src/app/portfolio/interfaces/portfolio-report.interface';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

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 '@ghostfolio/client/app/components/rules/rules.module';
+import { RulesModule } from '@ghostfolio/client/components/rules/rules.module';
 
 import { ReportPageRoutingModule } from './report-page-routing.module';
 import { ReportPageComponent } from './report-page.component';

apps/client/src/app/pages/transactions/transactions-page-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { TransactionsPageComponent } from './transactions-page.component';
 

apps/client/src/app/pages/transactions/transactions-page.component.ts

@@ -1,9 +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 { 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 { Order as OrderModel } from '@prisma/client';
 import { UpdateOrderDto } from 'apps/api/src/app/order/update-order.dto';

apps/client/src/app/pages/transactions/transactions-page.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 { RouterModule } from '@angular/router';
-import { GfTransactionsTableModule } from '@ghostfolio/client/app/components/transactions-table/transactions-table.module';
+import { GfTransactionsTableModule } from '@ghostfolio/client/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';

tsconfig.base.json

@@ -17,7 +17,7 @@
     "baseUrl": ".",
     "paths": {
       "@ghostfolio/api/*": ["apps/api/src/*"],
-      "@ghostfolio/client/*": ["apps/client/src/*"],
+      "@ghostfolio/client/*": ["apps/client/src/app/*"],
       "@ghostfolio/helper": ["libs/helper/src/index.ts"]
     }
   },