From c54e97e78802682589e2c0b2fd47292832c1ecba Mon Sep 17 00:00:00 2001 From: Bernd Heidemann Date: Wed, 11 Dec 2024 11:03:32 +0100 Subject: [PATCH] fixes --- docker/docker-compose.yml => compose.yml | 3 +-- src/app/app.config.ts | 3 ++- src/app/employee-list/employee-list.component.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename docker/docker-compose.yml => compose.yml (90%) diff --git a/docker/docker-compose.yml b/compose.yml similarity index 90% rename from docker/docker-compose.yml rename to compose.yml index a83a1d8..93fb9a4 100644 --- a/docker/docker-compose.yml +++ b/compose.yml @@ -1,4 +1,3 @@ -version: '3' volumes: employee_postgres_data: @@ -19,7 +18,7 @@ services: employee: container_name: employee - image: berndheidemann/employee-management-service:1.0.4 + image: berndheidemann/employee-management-service:1.1.3 # image: berndheidemann/employee-management-service_without_keycloak:1.1 environment: spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 6c6ef60..bbc46f2 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -2,7 +2,8 @@ import { ApplicationConfig } from '@angular/core'; import { provideRouter } from '@angular/router'; import { routes } from './app.routes'; +import {provideHttpClient, withInterceptorsFromDi} from "@angular/common/http"; export const appConfig: ApplicationConfig = { - providers: [provideRouter(routes)] + providers: [provideRouter(routes), provideHttpClient(withInterceptorsFromDi())] }; diff --git a/src/app/employee-list/employee-list.component.ts b/src/app/employee-list/employee-list.component.ts index 2a167a1..2d3a597 100644 --- a/src/app/employee-list/employee-list.component.ts +++ b/src/app/employee-list/employee-list.component.ts @@ -1,18 +1,18 @@ import { Component } from '@angular/core'; import { CommonModule } from '@angular/common'; import {Observable, of} from "rxjs"; -import {HttpClient, HttpClientModule, HttpHeaders} from "@angular/common/http"; +import {HttpClient, HttpHeaders} from "@angular/common/http"; import {Employee} from "../Employee"; @Component({ selector: 'app-employee-list', standalone: true, - imports: [CommonModule, HttpClientModule], + imports: [CommonModule], templateUrl: './employee-list.component.html', styleUrl: './employee-list.component.css' }) export class EmployeeListComponent { - bearer = 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzUFQ0dldiNno5MnlQWk1EWnBqT1U0RjFVN0lwNi1ELUlqQWVGczJPbGU0In0.eyJleHAiOjE3MjYwNDg1OTgsImlhdCI6MTcyNjA0NDk5OCwianRpIjoiOTllY2U1ZTEtMTMzZi00OWVkLWEyMDgtMTJmNTVmNjYyNDkzIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5zenV0LmRldi9hdXRoL3JlYWxtcy9zenV0IiwiYXVkIjoiYWNjb3VudCIsInN1YiI6IjU1NDZjZDIxLTk4NTQtNDMyZi1hNDY3LTRkZTNlZWRmNTg4OSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImVtcGxveWVlLW1hbmFnZW1lbnQtc2VydmljZSIsInNlc3Npb25fc3RhdGUiOiJlODYyMmQzNy1iZmJlLTQ3NzMtYWMzYi1hMDI5NDI4OGMxNWUiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NDIwMCJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsicHJvZHVjdF9vd25lciIsIm9mZmxpbmVfYWNjZXNzIiwiZGVmYXVsdC1yb2xlcy1zenV0IiwidW1hX2F1dGhvcml6YXRpb24iLCJ1c2VyIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJlbWFpbCBwcm9maWxlIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsInByZWZlcnJlZF91c2VybmFtZSI6InVzZXIifQ.DsLCU070WdBL2JawLeT6LVTm9WTbwrqPGJjCjd68mCPvKQC8FxgmbNjChsil_s-l0azf07VkBENYRlWWoM3tB1xWsJ2kIyDzA-dgL0JHa496Slw9EZVCrZtf90gzQgvoGqMANSkC6wx2a2jFecRJygVr0ozLpNNFHzvh8Q6dcnBw3GH1_giAzMdSNMa3wRnxoeF1q95T_QdBJVMg38hZIa6y9OOZDHchmXJIP0xGOur1mmDnqVy1W8gQ7kzVB5gXc_CsJsioQUR_QOMLQ879k-N9pKdV3_a97HnM25xSoj0Vw5n8mfReQoGTpjJZ9QFk5MVj4h4wt_mcBknL1mQ1JQ'; + bearer = 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzUFQ0dldiNno5MnlQWk1EWnBqT1U0RjFVN0lwNi1ELUlqQWVGczJPbGU0In0.eyJleHAiOjE3MzM5MTQ5MjgsImlhdCI6MTczMzkxMTMyOCwianRpIjoiMjNhYzMwMmUtYmYxNS00OTRmLWJhYTItNjIzODllYWZkMmZhIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5zenV0LmRldi9hdXRoL3JlYWxtcy9zenV0IiwiYXVkIjoiYWNjb3VudCIsInN1YiI6IjU1NDZjZDIxLTk4NTQtNDMyZi1hNDY3LTRkZTNlZWRmNTg4OSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImVtcGxveWVlLW1hbmFnZW1lbnQtc2VydmljZSIsInNlc3Npb25fc3RhdGUiOiI2ODdiMTEwYS00NTRjLTQwMzgtYjBkMS1kZDAzZGQ1N2JiNjEiLCJhY3IiOiIxIiwiYWxsb3dlZC1vcmlnaW5zIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NDIwMCJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsicHJvZHVjdF9vd25lciIsIm9mZmxpbmVfYWNjZXNzIiwiZGVmYXVsdC1yb2xlcy1zenV0IiwidW1hX2F1dGhvcml6YXRpb24iLCJ1c2VyIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJlbWFpbCBwcm9maWxlIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsInByZWZlcnJlZF91c2VybmFtZSI6InVzZXIifQ.E5ir1Z-POpUU_jvTh8CzoMYO74qo_7uQXw7QQBUvXB2_37pT3_tutAq6sM4V5cNBu--fWar5bltlNcOAWd_7Kdb66Qc23i0RR9vPneoSduJAzoD8gtFbx8c7ltNR4pG-c6tdnkGhLLqM621DShaSlH8Shp-Z0-y4Iq3GFdQrAFH1CrRVYlW0qFv1EZsE9BmhW3hJwrR1S2IPiEN6MwhehLflLa_ZgLcF417ocIfK-6gbbRNAwXA-JajFVOZAEVXs-52Ta9Kb_EEQFpRsjXorfflmbizQmgrbhBUB7MTiPYIcRruZSYdfmjcE008PHnut52cTcVYEuOrUCUqY4VmhoQ'; employees$: Observable; constructor(private http: HttpClient) {