Browse Source

Merge branch 'main' into feature/refactor-dialog-footer-and-header-components

pull/5445/head
Thomas Kaul 4 months ago
committed by GitHub
parent
commit
10c837ab06
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 24
      apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
  3. 27
      apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts
  4. 1
      apps/client/src/app/components/data-provider-status/data-provider-status.component.ts
  5. 4
      apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

1
CHANGELOG.md

@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Localized the content of the about page - Localized the content of the about page
- Refactored the dialog footer component - Refactored the dialog footer component
- Refactored the dialog header component - Refactored the dialog header component
- Refactored the benchmark comparator component to standalone
- Refactored the world map chart component to standalone - Refactored the world map chart component to standalone
- Improved the language localization for German (`de`) - Improved the language localization for German (`de`)
- Upgraded the _Stripe_ dependencies - Upgraded the _Stripe_ dependencies

24
apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts

@ -15,7 +15,9 @@ import { LineChartItem, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { internalRoutes } from '@ghostfolio/common/routes/routes'; import { internalRoutes } from '@ghostfolio/common/routes/routes';
import { ColorScheme } from '@ghostfolio/common/types'; import { ColorScheme } from '@ghostfolio/common/types';
import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
import { CommonModule } from '@angular/common';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
@ -26,6 +28,10 @@ import {
Output, Output,
ViewChild ViewChild
} from '@angular/core'; } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatSelectModule } from '@angular/material/select';
import { RouterModule } from '@angular/router';
import { IonIcon } from '@ionic/angular/standalone';
import { SymbolProfile } from '@prisma/client'; import { SymbolProfile } from '@prisma/client';
import { import {
Chart, Chart,
@ -42,15 +48,25 @@ import 'chartjs-adapter-date-fns';
import annotationPlugin from 'chartjs-plugin-annotation'; import annotationPlugin from 'chartjs-plugin-annotation';
import { addIcons } from 'ionicons'; import { addIcons } from 'ionicons';
import { arrowForwardOutline } from 'ionicons/icons'; import { arrowForwardOutline } from 'ionicons/icons';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@Component({ @Component({
selector: 'gf-benchmark-comparator',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: './benchmark-comparator.component.html', imports: [
CommonModule,
FormsModule,
GfPremiumIndicatorComponent,
IonIcon,
MatSelectModule,
NgxSkeletonLoaderModule,
ReactiveFormsModule,
RouterModule
],
selector: 'gf-benchmark-comparator',
styleUrls: ['./benchmark-comparator.component.scss'], styleUrls: ['./benchmark-comparator.component.scss'],
standalone: false templateUrl: './benchmark-comparator.component.html'
}) })
export class BenchmarkComparatorComponent implements OnChanges, OnDestroy { export class GfBenchmarkComparatorComponent implements OnChanges, OnDestroy {
@Input() benchmark: Partial<SymbolProfile>; @Input() benchmark: Partial<SymbolProfile>;
@Input() benchmarkDataItems: LineChartItem[] = []; @Input() benchmarkDataItems: LineChartItem[] = [];
@Input() benchmarks: Partial<SymbolProfile>[]; @Input() benchmarks: Partial<SymbolProfile>[];

27
apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts

@ -1,27 +0,0 @@
import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatSelectModule } from '@angular/material/select';
import { RouterModule } from '@angular/router';
import { IonIcon } from '@ionic/angular/standalone';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { BenchmarkComparatorComponent } from './benchmark-comparator.component';
@NgModule({
declarations: [BenchmarkComparatorComponent],
exports: [BenchmarkComparatorComponent],
imports: [
CommonModule,
FormsModule,
GfPremiumIndicatorComponent,
IonIcon,
MatSelectModule,
NgxSkeletonLoaderModule,
ReactiveFormsModule,
RouterModule
]
})
export class GfBenchmarkComparatorModule {}

1
apps/client/src/app/components/data-provider-status/data-provider-status.component.ts

@ -18,7 +18,6 @@ import { DataProviderStatus } from './interfaces/interfaces';
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
imports: [CommonModule, NgxSkeletonLoaderModule], imports: [CommonModule, NgxSkeletonLoaderModule],
selector: 'gf-data-provider-status', selector: 'gf-data-provider-status',
standalone: true,
templateUrl: './data-provider-status.component.html' templateUrl: './data-provider-status.component.html'
}) })
export class GfDataProviderStatusComponent implements OnDestroy, OnInit { export class GfDataProviderStatusComponent implements OnDestroy, OnInit {

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

@ -1,4 +1,4 @@
import { GfBenchmarkComparatorModule } from '@ghostfolio/client/components/benchmark-comparator/benchmark-comparator.module'; import { GfBenchmarkComparatorComponent } from '@ghostfolio/client/components/benchmark-comparator/benchmark-comparator.component';
import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module'; import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module';
import { DataService } from '@ghostfolio/client/services/data.service'; import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
@ -46,7 +46,7 @@ import { takeUntil } from 'rxjs/operators';
@Component({ @Component({
imports: [ imports: [
GfBenchmarkComparatorModule, GfBenchmarkComparatorComponent,
GfInvestmentChartModule, GfInvestmentChartModule,
GfPremiumIndicatorComponent, GfPremiumIndicatorComponent,
GfToggleComponent, GfToggleComponent,

Loading…
Cancel
Save