test

dysTOS · Mar 27, 2024 · 268aa77 · 268aa77
1 parent 82bb952
commit 268aa77
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 46 deletions.
diff --git a/.github/workflows/build-deploy-mkj-test.yml b/.github/workflows/build-deploy-mkj-test.yml
@@ -18,9 +18,14 @@ jobs:
                   node-version: 20
                   cache: "npm"
 
-            - name: Change environment
+            - name: Update environment file
               run: |
-                sed -i 's/config.appTitle/"${{secrets.FTP_SERVER}}"/g' src/environments/environment.publictest.ts
+                sed -i 's/'production'/"${{secrets.TEST_PRODUCTION}}"/g' src/environments/environment.prod.ts
+                sed -i 's/'publictest'/"${{secrets.TEST_PUBLICTEST}}"/g' src/environments/environment.prod.ts
+                sed -i 's/'appTitle'/"${{secrets.TEST_APPTITLE}}"/g' src/environments/environment.prod.ts
+                sed -i 's/'apiUrl'/"${{secrets.TEST_APIURL}}"/g' src/environments/environment.prod.ts
+                sed -i 's/'wsHost'/"${{secrets.TEST_WSHOST}}"/g' src/environments/environment.prod.ts
+                sed -i 's/'wsAppKey'/"${{secrets.TEST_WSAPPKEY}}"/g' src/environments/environment.prod.ts
 
             - name: Install dependencies
               run: npm ci

diff --git a/angular.json b/angular.json
@@ -82,7 +82,7 @@
                             "fileReplacements": [
                                 {
                                     "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.publictest.ts"
+                                    "with": "src/environments/environment.prod.ts"
                                 }
                             ],
                             "outputHashing": "all"
@@ -108,7 +108,7 @@
                             "fileReplacements": [
                                 {
                                     "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.gulaschmusi.ts"
+                                    "with": "src/environments/environment.prod.ts"
                                 }
                             ],
                             "assets": [

diff --git a/src/app/services/api/websocket.service.ts b/src/app/services/api/websocket.service.ts
@@ -35,7 +35,7 @@ export class WebsocketService {
     (window as any).Pusher = Pusher;
     this._echo = new Echo({
       broadcaster: 'reverb',
-      key: 'akkq3uvoftnearumcyzb',
+      key: environment.wsAppKey,
       wsHost: environment.wsHost,
       wsPort: environment.production ? 443 : 8080,
       wssPort: environment.production ? 443 : 8080,

diff --git a/src/configurations/_CONFIG_MAP.ts b/src/configurations/_CONFIG_MAP.ts
@@ -3,8 +3,9 @@ export interface AppConfig {
     appTitle: string;
     production: boolean;
     apiUrl: string;
-    wsHost: string;
     publictest: boolean;
+    wsHost: string;
+    wsAppKey: string;
   };
 }
 
@@ -13,6 +14,7 @@ export const CONFIG_MAP: AppConfig = {
     production: false,
     publictest: true,
     wsHost: 'localhost',
+    wsAppKey: 'akkq3uvoftnearumcyzb',
 
     apiUrl: 'http://localhost:8000/api/',
     // apiUrl: 'https://api-test.mk-jainzen.at/api/',
@@ -24,19 +26,22 @@ export const CONFIG_MAP: AppConfig = {
     apiUrl: 'https://api-test.mk-jainzen.at/api/',
     wsHost: 'api-test.mk-jainzen.at',
     publictest: true,
+    wsAppKey: 'akkq3uvoftnearumcyzb',
   },
   mkj: {
     appTitle: 'mkjAPP',
     production: true,
     apiUrl: 'https://api.mk-jainzen.at/api/',
     wsHost: 'api.mk-jainzen.at',
     publictest: false,
+    wsAppKey: 'akkq3uvoftnearumcyzb',
   },
   gmr: {
     appTitle: 'gulaschAPP',
     production: true,
     apiUrl: 'https://api.gulaschmusi.at/api/',
     wsHost: 'api.gulaschmusi.at',
     publictest: false,
+    wsAppKey: 'akkq3uvoftnearumcyzb',
   },
 };
diff --git a/src/environments/environment.gulaschmusi.ts b/src/environments/environment.gulaschmusi.ts
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -1,11 +1,8 @@
-import { CONFIG_MAP } from '../configurations/_CONFIG_MAP';
-
-const config = CONFIG_MAP.mkj;
-
 export const environment = {
-  production: config.production,
-  apiUrl: config.apiUrl,
-  appTitle: config.appTitle,
-  publictest: config.publictest,
-  wsHost: config.wsHost,
+  production: 'production',
+  publictest: 'publictest',
+  appTitle: 'appTitle',
+  apiUrl: 'apiUrl',
+  wsHost: 'wsHost',
+  wsAppKey: 'wsAppKey',
 };
diff --git a/src/environments/environment.publictest.ts b/src/environments/environment.publictest.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -3,14 +3,11 @@
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
-import { CONFIG_MAP } from '../configurations/_CONFIG_MAP';
-
-const config = CONFIG_MAP.local;
-
 export const environment = {
-  production: config.production,
-  apiUrl: config.apiUrl,
-  wsHost: config.wsHost,
-  appTitle: config.appTitle,
-  publictest: config.publictest,
+  production: true,
+  publictest: true,
+  appTitle: 'mkjLOCAL',
+  apiUrl: 'http://localhost:8000/api/',
+  wsHost: 'localhost',
+  wsAppKey: 'akkq3uvoftnearumcyzb',
 };