implemented enviroment variables for production so se4rver doesnt use…

… localhost

apps/InstrumentRental-web/project.json

@@ -26,6 +26,12 @@
       },
       "configurations": {
         "production": {
+          "fileReplacements": [
+            {
+              "replace": "libs/shared/util-env/src/lib/env.development.ts",
+              "with": "libs/shared/util-env/src/lib/env.production.ts"
+            }
+          ],
           "budgets": [
             {
               "type": "initial",

apps/data-api/src/main.ts

@@ -7,7 +7,7 @@ import { Logger } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app/app.module';
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
-import { ApiResponseInterceptor } from '../../../libs/backend/dto/src/lib/api-response.interceptor';
+import { ApiResponseInterceptor } from '@InstrumentRental/backend/dto'
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);

libs/backend/dto/src/index.ts

@@ -1,2 +1,3 @@
 export * from './lib/dto.module';
 export * from './lib/instrument.dto'
+export * from './lib/api-response.interceptor'

libs/frontend/features/src/lib/instrument/instrument.service.ts

@@ -1,8 +1,9 @@
 import { Observable, throwError } from 'rxjs';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { map, catchError, tap } from 'rxjs/operators';
+import { catchError, map, tap } from 'rxjs/operators';
 import { ApiResponse, IInstrument } from '@InstrumentRental/shared/api';
 import { Injectable } from '@angular/core';
+import { env } from '@InstrumentRental/shared/util-env';
 
 /**
  * See https://angular.io/guide/http#requesting-data-from-a-server
@@ -18,7 +19,10 @@ export const httpOptions = {
  */
 @Injectable()
 export class InstrumentService {
-  endpoint = 'http://localhost:3000/api/instrument';
+  /*
+    endpoint = 'http://localhost:3000/api/instrument';
+  */
+  endpoint = env.dataApiUrl + '/instrument';
 
   constructor(private readonly http: HttpClient) {}
 

libs/shared/util-env/README.md

@@ -0,0 +1,7 @@
+# util-env
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test util-env` to execute the unit tests via [Jest](https://jestjs.io).

libs/shared/util-env/eslint.config.js

@@ -0,0 +1,3 @@
+const baseConfig = require('../../../eslint.config.js');
+
+module.exports = [...baseConfig];

libs/shared/util-env/jest.config.ts

@@ -0,0 +1,10 @@
+export default {
+  displayName: 'util-env',
+  preset: '../../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../coverage/libs/shared/util-env',
+};

libs/shared/util-env/project.json

@@ -0,0 +1,16 @@
+{
+  "name": "util-env",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/shared/util-env/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/shared/util-env/jest.config.ts"
+      }
+    }
+  }
+}

libs/shared/util-env/src/index.ts

@@ -0,0 +1,2 @@
+export * from './lib/env.development'
+export * from './lib/env.interface'

libs/shared/util-env/src/lib/env.development.ts

@@ -0,0 +1,6 @@
+import { IEnv } from './env.interface';
+
+export const env: IEnv = {
+  production: false,
+  dataApiUrl: 'https://localhost:3000'
+}

libs/shared/util-env/src/lib/env.interface.ts

@@ -0,0 +1,4 @@
+export interface IEnv {
+  production: boolean,
+  dataApiUrl: string
+}

libs/shared/util-env/src/lib/env.production.ts

@@ -0,0 +1,6 @@
+import { IEnv } from './env.interface';
+
+export const env: IEnv = {
+  production: false,
+  dataApiUrl: 'instrumentrental-api-d2f7ahfvh8d2ahd0.westeurope-01.azurewebsites.net'
+}

libs/shared/util-env/src/lib/env.ts

@@ -0,0 +1,3 @@
+export function env(): string {
+  return 'util-env';
+}

libs/shared/util-env/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs"
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}

libs/shared/util-env/tsconfig.lib.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
+  "include": ["src/**/*.ts"]
+}

libs/shared/util-env/tsconfig.spec.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}

tsconfig.base.json

@@ -20,6 +20,9 @@
         "libs/backend/features/src/index.ts"
       ],
       "@InstrumentRental/shared/api": ["libs/shared/api/src/index.ts"],
+      "@InstrumentRental/shared/util-env": [
+        "libs/shared/util-env/src/index.ts"
+      ],
       "@avans-nx-workshop/shared/api": ["libs/shared/api/src/index.ts"],
       "@instrument-rental/common": ["libs/frontend/common/src/index.ts"],
       "@instrument-rental/features": ["libs/frontend/features/src/index.ts"],