Compare commits
5 commits
dd9f66cae6
...
3092f4a688
Author | SHA1 | Date | |
---|---|---|---|
3092f4a688 | |||
09fdd83192 | |||
8c9d7c498b | |||
abc4277e84 | |||
a7d98e1150 |
7 changed files with 16 additions and 13 deletions
|
@ -1,7 +1,7 @@
|
|||
plugins {
|
||||
java
|
||||
id("org.springframework.boot") version "3.3.3"
|
||||
id("io.spring.dependency-management") version "1.1.6"
|
||||
id("org.springframework.boot") version "3.4.3"
|
||||
id("io.spring.dependency-management") version "1.1.7"
|
||||
id("checkstyle")
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
@ -28,7 +28,7 @@ services:
|
|||
condition: service_healthy
|
||||
|
||||
keycloakdb_svr:
|
||||
image: postgres:14.2
|
||||
image: postgres:14.17
|
||||
volumes:
|
||||
- postgres_data_keycloak_db:/var/lib/postgresql/data
|
||||
environment:
|
||||
|
@ -41,7 +41,7 @@ services:
|
|||
- "9433:5432"
|
||||
|
||||
postgres_db:
|
||||
image: postgres:16.4
|
||||
image: postgres:16.8
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
|
|
|
@ -7,7 +7,7 @@ volumes:
|
|||
services:
|
||||
postgres-employee:
|
||||
container_name: postgres_employee
|
||||
image: postgres:13.3
|
||||
image: postgres:13.20
|
||||
volumes:
|
||||
- employee_postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
|
@ -19,7 +19,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
|
||||
|
|
|
@ -32,7 +32,7 @@ import gsap from 'gsap';
|
|||
})
|
||||
export class DepositComponent implements OnInit, AfterViewInit, OnDestroy, OnChanges {
|
||||
@Input() isOpen = false;
|
||||
@Output() close = new EventEmitter<void>();
|
||||
@Output() closeModalEmitter = new EventEmitter<void>();
|
||||
@ViewChild('modalBg') modalBg!: ElementRef;
|
||||
@ViewChild('modalCard') modalCard!: ElementRef;
|
||||
protected form!: FormGroup;
|
||||
|
@ -110,7 +110,7 @@ export class DepositComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
|
|||
this.modalAnimationService.closeModal(
|
||||
this.modalCard.nativeElement,
|
||||
this.modalBg.nativeElement,
|
||||
() => this.close.emit()
|
||||
() => this.closeModalEmitter.emit()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -73,7 +73,10 @@
|
|||
<h3 class="section-heading text-xl mb-4">Konto</h3>
|
||||
<div class="space-y-4">
|
||||
<button class="button-primary w-full py-2" (click)="openDepositModal()">Einzahlen</button>
|
||||
<app-deposit [isOpen]="isDepositModalOpen" (close)="closeDepositModal()"></app-deposit>
|
||||
<app-deposit
|
||||
[isOpen]="isDepositModalOpen"
|
||||
(closeModalEmitter)="closeDepositModal()"
|
||||
></app-deposit>
|
||||
<button class="bg-deep-blue-light hover:bg-deep-blue-contrast w-full py-2 rounded">
|
||||
Transaktionen
|
||||
</button>
|
||||
|
@ -85,7 +88,7 @@
|
|||
|
||||
<app-confirmation
|
||||
[successful]="isDepositSuccessful"
|
||||
(close)="closeDepositConfirmationModal()"
|
||||
(closeConfirmation)="closeDepositConfirmationModal()"
|
||||
></app-confirmation>
|
||||
|
||||
<div class="card p-4">
|
||||
|
|
|
@ -19,7 +19,7 @@ import gsap from 'gsap';
|
|||
})
|
||||
export class ConfirmationComponent implements AfterViewInit, OnDestroy {
|
||||
@Input() successful = true;
|
||||
@Output() close = new EventEmitter<void>();
|
||||
@Output() closeConfirmation = new EventEmitter<void>();
|
||||
@ViewChild('modalBg') modalBg!: ElementRef;
|
||||
@ViewChild('modalCard') modalCard!: ElementRef;
|
||||
|
||||
|
@ -43,7 +43,7 @@ export class ConfirmationComponent implements AfterViewInit, OnDestroy {
|
|||
this.modalAnimationService.closeModal(
|
||||
this.modalCard.nativeElement,
|
||||
this.modalBg.nativeElement,
|
||||
() => this.close.emit()
|
||||
() => this.closeConfirmation.emit()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue