Browse Source

Refactoring

pull/6159/head
Thomas Kaul 7 days ago
parent
commit
c1c282308a
  1. 2
      apps/client/src/environments/environment.prod.ts
  2. 3
      apps/client/src/environments/environment.ts
  3. 2
      apps/client/src/main.ts
  4. 5
      libs/ui/src/lib/environment/environment.interface.ts
  5. 6
      libs/ui/src/lib/environment/environment.token.ts
  6. 2
      libs/ui/src/lib/environment/index.ts
  7. 2
      libs/ui/src/lib/services/admin.service.ts
  8. 1
      libs/ui/src/lib/tokens/index.ts

2
apps/client/src/environments/environment.prod.ts

@ -1,4 +1,4 @@
import type { GfEnvironment } from '@ghostfolio/ui/tokens'; import type { GfEnvironment } from '@ghostfolio/ui/environment';
export const environment: GfEnvironment = { export const environment: GfEnvironment = {
lastPublish: '{BUILD_TIMESTAMP}', lastPublish: '{BUILD_TIMESTAMP}',

3
apps/client/src/environments/environment.ts

@ -1,7 +1,8 @@
import type { GfEnvironment } from '@ghostfolio/ui/environment';
// This file can be replaced during build by using the `fileReplacements` array. // This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
import type { GfEnvironment } from '@ghostfolio/ui/tokens';
export const environment: GfEnvironment = { export const environment: GfEnvironment = {
lastPublish: null, lastPublish: null,

2
apps/client/src/main.ts

@ -1,7 +1,7 @@
import { InfoResponse } from '@ghostfolio/common/interfaces'; import { InfoResponse } from '@ghostfolio/common/interfaces';
import { filterGlobalPermissions } from '@ghostfolio/common/permissions'; import { filterGlobalPermissions } from '@ghostfolio/common/permissions';
import { GF_ENVIRONMENT } from '@ghostfolio/ui/environment';
import { GfNotificationModule } from '@ghostfolio/ui/notifications'; import { GfNotificationModule } from '@ghostfolio/ui/notifications';
import { GF_ENVIRONMENT } from '@ghostfolio/ui/tokens';
import { Platform } from '@angular/cdk/platform'; import { Platform } from '@angular/cdk/platform';
import { import {

5
libs/ui/src/lib/environment/environment.interface.ts

@ -0,0 +1,5 @@
export interface GfEnvironment {
lastPublish: string | null;
production: boolean;
stripePublicKey: string;
}

6
libs/ui/src/lib/tokens/env.token.ts → libs/ui/src/lib/environment/environment.token.ts

@ -1,10 +1,6 @@
import { InjectionToken } from '@angular/core'; import { InjectionToken } from '@angular/core';
export interface GfEnvironment { import { GfEnvironment } from './environment.interface';
lastPublish: string | null;
production: boolean;
stripePublicKey: string;
}
export const GF_ENVIRONMENT = new InjectionToken<GfEnvironment>( export const GF_ENVIRONMENT = new InjectionToken<GfEnvironment>(
'GF_ENVIRONMENT' 'GF_ENVIRONMENT'

2
libs/ui/src/lib/environment/index.ts

@ -0,0 +1,2 @@
export * from './environment.interface';
export * from './environment.token';

2
libs/ui/src/lib/services/admin.service.ts

@ -21,8 +21,8 @@ import {
Filter Filter
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { DateRange } from '@ghostfolio/common/types'; import { DateRange } from '@ghostfolio/common/types';
import { GF_ENVIRONMENT, GfEnvironment } from '@ghostfolio/ui/environment';
import { DataService } from '@ghostfolio/ui/services'; import { DataService } from '@ghostfolio/ui/services';
import { GfEnvironment, GF_ENVIRONMENT } from '@ghostfolio/ui/tokens';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Inject, Injectable } from '@angular/core'; import { Inject, Injectable } from '@angular/core';

1
libs/ui/src/lib/tokens/index.ts

@ -1 +0,0 @@
export * from './env.token';
Loading…
Cancel
Save