Browse Source

Refactoring

pull/5206/head
Thomas Kaul 2 days ago
parent
commit
b76deb1e5e
  1. 10
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  2. 2
      apps/client/src/app/components/home-overview/home-overview.component.ts
  3. 2
      apps/client/src/app/components/home-summary/home-summary.component.ts
  4. 2
      apps/client/src/app/pages/home/home-page.component.ts
  5. 16
      apps/client/src/app/pages/home/home-page.routes.ts
  6. 8
      apps/client/src/app/pages/zen/zen-page-routing.module.ts
  7. 8
      apps/client/src/app/pages/zen/zen-page.module.ts

10
apps/client/src/app/components/home-holdings/home-holdings.component.ts

@ -51,7 +51,7 @@ import { takeUntil } from 'rxjs/operators';
styleUrls: ['./home-holdings.scss'], styleUrls: ['./home-holdings.scss'],
templateUrl: './home-holdings.html' templateUrl: './home-holdings.html'
}) })
export class HomeHoldingsComponent implements OnDestroy, OnInit { export class GfHomeHoldingsComponent implements OnDestroy, OnInit {
public static DEFAULT_HOLDINGS_VIEW_MODE: HoldingsViewMode = 'TABLE'; public static DEFAULT_HOLDINGS_VIEW_MODE: HoldingsViewMode = 'TABLE';
public deviceType: string; public deviceType: string;
@ -68,7 +68,7 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
internalRoutes.portfolio.subRoutes.activities.routerLink; internalRoutes.portfolio.subRoutes.activities.routerLink;
public user: User; public user: User;
public viewModeFormControl = new FormControl<HoldingsViewMode>( public viewModeFormControl = new FormControl<HoldingsViewMode>(
HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE
); );
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -178,14 +178,14 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
this.viewModeFormControl.setValue( this.viewModeFormControl.setValue(
this.deviceType === 'mobile' this.deviceType === 'mobile'
? HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE ? GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE
: this.user?.settings?.holdingsViewMode || : this.user?.settings?.holdingsViewMode ||
HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE, GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE,
{ emitEvent: false } { emitEvent: false }
); );
} else if (this.holdingType === 'CLOSED') { } else if (this.holdingType === 'CLOSED') {
this.viewModeFormControl.setValue( this.viewModeFormControl.setValue(
HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE, GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE,
{ emitEvent: false } { emitEvent: false }
); );
} }

2
apps/client/src/app/components/home-overview/home-overview.component.ts

@ -42,7 +42,7 @@ import { takeUntil } from 'rxjs/operators';
styleUrls: ['./home-overview.scss'], styleUrls: ['./home-overview.scss'],
templateUrl: './home-overview.html' templateUrl: './home-overview.html'
}) })
export class HomeOverviewComponent implements OnDestroy, OnInit { export class GfHomeOverviewComponent implements OnDestroy, OnInit {
public dateRangeOptions = ToggleComponent.DEFAULT_DATE_RANGE_OPTIONS; public dateRangeOptions = ToggleComponent.DEFAULT_DATE_RANGE_OPTIONS;
public deviceType: string; public deviceType: string;
public errors: AssetProfileIdentifier[]; public errors: AssetProfileIdentifier[];

2
apps/client/src/app/components/home-summary/home-summary.component.ts

@ -28,7 +28,7 @@ import { takeUntil } from 'rxjs/operators';
styleUrls: ['./home-summary.scss'], styleUrls: ['./home-summary.scss'],
templateUrl: './home-summary.html' templateUrl: './home-summary.html'
}) })
export class HomeSummaryComponent implements OnDestroy, OnInit { export class GfHomeSummaryComponent implements OnDestroy, OnInit {
public hasImpersonationId: boolean; public hasImpersonationId: boolean;
public hasPermissionForSubscription: boolean; public hasPermissionForSubscription: boolean;
public hasPermissionToUpdateUserSettings: boolean; public hasPermissionToUpdateUserSettings: boolean;

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

@ -34,7 +34,7 @@ import { takeUntil } from 'rxjs/operators';
styleUrls: ['./home-page.scss'], styleUrls: ['./home-page.scss'],
templateUrl: './home-page.html' templateUrl: './home-page.html'
}) })
export class HomePageComponent implements OnDestroy, OnInit { export class GfHomePageComponent implements OnDestroy, OnInit {
public deviceType: string; public deviceType: string;
public hasImpersonationId: boolean; public hasImpersonationId: boolean;
public tabs: TabConfiguration[] = []; public tabs: TabConfiguration[] = [];

16
apps/client/src/app/pages/home/home-page.routes.ts

@ -1,7 +1,7 @@
import { HomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component';
import { HomeMarketComponent } from '@ghostfolio/client/components/home-market/home-market.component'; import { HomeMarketComponent } from '@ghostfolio/client/components/home-market/home-market.component';
import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component';
import { HomeSummaryComponent } from '@ghostfolio/client/components/home-summary/home-summary.component'; import { GfHomeSummaryComponent } from '@ghostfolio/client/components/home-summary/home-summary.component';
import { HomeWatchlistComponent } from '@ghostfolio/client/components/home-watchlist/home-watchlist.component'; import { HomeWatchlistComponent } from '@ghostfolio/client/components/home-watchlist/home-watchlist.component';
import { MarketsComponent } from '@ghostfolio/client/components/markets/markets.component'; import { MarketsComponent } from '@ghostfolio/client/components/markets/markets.component';
import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
@ -9,7 +9,7 @@ import { internalRoutes } from '@ghostfolio/common/routes/routes';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';
import { HomePageComponent } from './home-page.component'; import { GfHomePageComponent } from './home-page.component';
export const routes: Routes = [ export const routes: Routes = [
{ {
@ -17,16 +17,16 @@ export const routes: Routes = [
children: [ children: [
{ {
path: '', path: '',
component: HomeOverviewComponent component: GfHomeOverviewComponent
}, },
{ {
path: internalRoutes.home.subRoutes.holdings.path, path: internalRoutes.home.subRoutes.holdings.path,
component: HomeHoldingsComponent, component: GfHomeHoldingsComponent,
title: internalRoutes.home.subRoutes.holdings.title title: internalRoutes.home.subRoutes.holdings.title
}, },
{ {
path: internalRoutes.home.subRoutes.summary.path, path: internalRoutes.home.subRoutes.summary.path,
component: HomeSummaryComponent, component: GfHomeSummaryComponent,
title: internalRoutes.home.subRoutes.summary.title title: internalRoutes.home.subRoutes.summary.title
}, },
{ {
@ -45,7 +45,7 @@ export const routes: Routes = [
title: internalRoutes.home.subRoutes.watchlist.title title: internalRoutes.home.subRoutes.watchlist.title
} }
], ],
component: HomePageComponent, component: GfHomePageComponent,
path: '', path: '',
title: internalRoutes.home.title title: internalRoutes.home.title
} }

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

@ -1,5 +1,5 @@
import { HomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component';
import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component';
import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
import { internalRoutes } from '@ghostfolio/common/routes/routes'; import { internalRoutes } from '@ghostfolio/common/routes/routes';
@ -14,11 +14,11 @@ const routes: Routes = [
children: [ children: [
{ {
path: '', path: '',
component: HomeOverviewComponent component: GfHomeOverviewComponent
}, },
{ {
path: internalRoutes.zen.subRoutes.holdings.path, path: internalRoutes.zen.subRoutes.holdings.path,
component: HomeHoldingsComponent, component: GfHomeHoldingsComponent,
title: internalRoutes.home.subRoutes.holdings.title title: internalRoutes.home.subRoutes.holdings.title
} }
], ],

8
apps/client/src/app/pages/zen/zen-page.module.ts

@ -1,5 +1,5 @@
import { HomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component';
import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
@ -14,8 +14,8 @@ import { ZenPageComponent } from './zen-page.component';
declarations: [ZenPageComponent], declarations: [ZenPageComponent],
imports: [ imports: [
CommonModule, CommonModule,
HomeHoldingsComponent, GfHomeHoldingsComponent,
HomeOverviewComponent, GfHomeOverviewComponent,
IonIcon, IonIcon,
MatTabsModule, MatTabsModule,
RouterModule, RouterModule,

Loading…
Cancel
Save