Merge branch 'main' into styleguide
All checks were successful
CI / prettier (pull_request) Successful in 46s
CI / eslint (pull_request) Successful in 54s
CI / Checkstyle Main (pull_request) Successful in 1m4s
CI / test-build (pull_request) Successful in 1m3s

This commit is contained in:
Jan-Marlon Leibl 2025-03-12 18:53:16 +00:00
commit cd098f717c
4 changed files with 15 additions and 12 deletions

View file

@ -10,9 +10,9 @@ jobs:
image: "cimg/openjdk:23.0-node"
steps:
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: "Cache Gradle dependencies"
uses: https://github.com/actions/cache@v3
uses: https://github.com/actions/cache@v4
with:
path: |
~/.gradle/caches
@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@v4
- name: Install bun
uses: oven-sh/setup-bun@v2
- uses: actions/cache@v3
- uses: actions/cache@v4
working-directory: ./frontend
with:
path: |
@ -65,7 +65,7 @@ jobs:
uses: actions/checkout@v4
- name: Install bun
uses: oven-sh/setup-bun@v2
- uses: actions/cache@v3
- uses: actions/cache@v4
working-directory: ./frontend
with:
path: |
@ -91,7 +91,7 @@ jobs:
uses: actions/checkout@v4
- name: Install bun
uses: oven-sh/setup-bun@v2
- uses: actions/cache@v3
- uses: actions/cache@v4
working-directory: ./frontend
with:
path: |
@ -99,7 +99,7 @@ jobs:
key: ${{ runner.os }}-bun-
restore-keys: |
${{ runner.os }}-bun-
- uses: actions/cache@v3
- uses: actions/cache@v4
working-directory: ./frontend
with:
path: |

View file

@ -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()
);
}
}

View file

@ -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">

View file

@ -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()
);
}
}