From c1c282308a73f9cc9d2954f458fc7d2585367c14 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 5 Jan 2026 11:13:35 +0100
Subject: [PATCH] Refactoring

---
 apps/client/src/environments/environment.prod.ts            | 2 +-
 apps/client/src/environments/environment.ts                 | 3 ++-
 apps/client/src/main.ts                                     | 2 +-
 libs/ui/src/lib/environment/environment.interface.ts        | 5 +++++
 .../env.token.ts => environment/environment.token.ts}       | 6 +-----
 libs/ui/src/lib/environment/index.ts                        | 2 ++
 libs/ui/src/lib/services/admin.service.ts                   | 2 +-
 libs/ui/src/lib/tokens/index.ts                             | 1 -
 8 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 libs/ui/src/lib/environment/environment.interface.ts
 rename libs/ui/src/lib/{tokens/env.token.ts => environment/environment.token.ts} (54%)
 create mode 100644 libs/ui/src/lib/environment/index.ts
 delete mode 100644 libs/ui/src/lib/tokens/index.ts

diff --git a/apps/client/src/environments/environment.prod.ts b/apps/client/src/environments/environment.prod.ts
index 6e666f46f..4ee0d508b 100644
--- a/apps/client/src/environments/environment.prod.ts
+++ b/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 = {
   lastPublish: '{BUILD_TIMESTAMP}',
diff --git a/apps/client/src/environments/environment.ts b/apps/client/src/environments/environment.ts
index 791828b69..ccedf6738 100644
--- a/apps/client/src/environments/environment.ts
+++ b/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.
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
-import type { GfEnvironment } from '@ghostfolio/ui/tokens';
 
 export const environment: GfEnvironment = {
   lastPublish: null,
diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
index 2b916315b..f596de5f4 100644
--- a/apps/client/src/main.ts
+++ b/apps/client/src/main.ts
@@ -1,7 +1,7 @@
 import { InfoResponse } from '@ghostfolio/common/interfaces';
 import { filterGlobalPermissions } from '@ghostfolio/common/permissions';
+import { GF_ENVIRONMENT } from '@ghostfolio/ui/environment';
 import { GfNotificationModule } from '@ghostfolio/ui/notifications';
-import { GF_ENVIRONMENT } from '@ghostfolio/ui/tokens';
 
 import { Platform } from '@angular/cdk/platform';
 import {
diff --git a/libs/ui/src/lib/environment/environment.interface.ts b/libs/ui/src/lib/environment/environment.interface.ts
new file mode 100644
index 000000000..9cb279515
--- /dev/null
+++ b/libs/ui/src/lib/environment/environment.interface.ts
@@ -0,0 +1,5 @@
+export interface GfEnvironment {
+  lastPublish: string | null;
+  production: boolean;
+  stripePublicKey: string;
+}
diff --git a/libs/ui/src/lib/tokens/env.token.ts b/libs/ui/src/lib/environment/environment.token.ts
similarity index 54%
rename from libs/ui/src/lib/tokens/env.token.ts
rename to libs/ui/src/lib/environment/environment.token.ts
index b717b212d..277e9c5e2 100644
--- a/libs/ui/src/lib/tokens/env.token.ts
+++ b/libs/ui/src/lib/environment/environment.token.ts
@@ -1,10 +1,6 @@
 import { InjectionToken } from '@angular/core';
 
-export interface GfEnvironment {
-  lastPublish: string | null;
-  production: boolean;
-  stripePublicKey: string;
-}
+import { GfEnvironment } from './environment.interface';
 
 export const GF_ENVIRONMENT = new InjectionToken<GfEnvironment>(
   'GF_ENVIRONMENT'
diff --git a/libs/ui/src/lib/environment/index.ts b/libs/ui/src/lib/environment/index.ts
new file mode 100644
index 000000000..828eea646
--- /dev/null
+++ b/libs/ui/src/lib/environment/index.ts
@@ -0,0 +1,2 @@
+export * from './environment.interface';
+export * from './environment.token';
diff --git a/libs/ui/src/lib/services/admin.service.ts b/libs/ui/src/lib/services/admin.service.ts
index ec2e36cf6..145f134e3 100644
--- a/libs/ui/src/lib/services/admin.service.ts
+++ b/libs/ui/src/lib/services/admin.service.ts
@@ -21,8 +21,8 @@ import {
   Filter
 } from '@ghostfolio/common/interfaces';
 import { DateRange } from '@ghostfolio/common/types';
+import { GF_ENVIRONMENT, GfEnvironment } from '@ghostfolio/ui/environment';
 import { DataService } from '@ghostfolio/ui/services';
-import { GfEnvironment, GF_ENVIRONMENT } from '@ghostfolio/ui/tokens';
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Inject, Injectable } from '@angular/core';
diff --git a/libs/ui/src/lib/tokens/index.ts b/libs/ui/src/lib/tokens/index.ts
deleted file mode 100644
index c9dab8e0e..000000000
--- a/libs/ui/src/lib/tokens/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './env.token';