diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java index ebddd1a..158e32c 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -74,10 +74,6 @@ public class BlackJackService { UserEntity user = getUserWithFreshData(game.getUser()); BigDecimal additionalBet = game.getBet(); - if (user.getBalance().compareTo(additionalBet) < 0) { - return game; - } - deductBetFromBalance(user, additionalBet); game.setBet(game.getBet().add(additionalBet)); diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index 887aeeb..1737cd9 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -51,3 +51,10 @@ [show]="showGameResult()" (gameResultClosed)="onCloseGameResult()" > + + + diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.ts b/frontend/src/app/feature/game/blackjack/blackjack.component.ts index 78f3533..702776e 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.ts +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.ts @@ -14,6 +14,7 @@ import { GameState } from '@blackjack/enum/gameState'; import { NavbarComponent } from '@shared/components/navbar/navbar.component'; import { UserService } from '@service/user.service'; import { timer } from 'rxjs'; +import { DebtDialogComponent } from '@shared/components/debt-dialog/debt-dialog.component'; @Component({ selector: 'app-blackjack', @@ -27,6 +28,7 @@ import { timer } from 'rxjs'; GameControlsComponent, GameInfoComponent, GameResultComponent, + DebtDialogComponent, ], templateUrl: './blackjack.component.html', changeDetection: ChangeDetectionStrategy.OnPush, @@ -48,6 +50,9 @@ export default class BlackjackComponent implements OnInit { isActionInProgress = signal(false); currentAction = signal(''); + showDebtDialog = signal(false); + debtAmount = signal(0); + ngOnInit(): void { this.userService.currentUser$.subscribe((user) => { if (user) { @@ -167,7 +172,12 @@ export default class BlackjackComponent implements OnInit { this.blackjackService.doubleDown(this.currentGameId()!).subscribe({ next: (game) => { this.updateGameState(game); - this.userService.refreshCurrentUser(); + this.userService.getCurrentUser().subscribe((user) => { + if (user && user.balance < 0) { + this.debtAmount.set(Math.abs(user.balance)); + this.showDebtDialog.set(true); + } + }); this.isActionInProgress.set(false); }, error: (error) => { @@ -184,6 +194,10 @@ export default class BlackjackComponent implements OnInit { this.userService.refreshCurrentUser(); } + onCloseDebtDialog(): void { + this.showDebtDialog.set(false); + } + private handleGameError(error: HttpErrorResponse): void { if (error instanceof HttpErrorResponse) { if (error.status === 400 && error.error?.error === 'Invalid state') { diff --git a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts index 45174ca..b1a40ed 100644 --- a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts @@ -9,7 +9,7 @@ import { PlayingCardComponent } from '../playing-card/playing-card.component'; imports: [CommonModule, PlayingCardComponent], template: `
-

Croupier's Karten

+

Dealer's Karten

@if (cards.length > 0) { diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts index b76baa5..cba3ac4 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts @@ -13,39 +13,29 @@ import { GameState } from '../../enum/gameState';

{{ getResultMessage() }}

-
+
Einsatz:
-
{{ amount }} €
+
{{ amount | currency:'EUR' }}
{{ isDraw ? 'Zurückgegeben:' : isWin ? 'Gewonnen:' : 'Verloren:' }}
-
- {{ isLoss ? '-' : '+' }}{{ amount }} € +
+ {{ isLoss ? '-' : '+' }}{{ isWin ? (amount * 2) : amount | currency:'EUR' }}
-
- Gesamt: -
-
- {{ isWin ? '+' : isLoss ? '-' : '' }}{{ amount }} € +
Gesamt:
+
+ {{ isWin ? (amount * 2) : (isDraw ? amount : 0) | currency:'EUR' }}
@@ -76,6 +66,7 @@ import { GameState } from '../../enum/gameState'; export class GameResultComponent { @Input() gameState: GameState = GameState.IN_PROGRESS; @Input() amount = 0; + @Input() balance = 0; @Input() set show(value: boolean) { console.log('GameResultComponent show input changed:', value, 'gameState:', this.gameState); this.visible = value; diff --git a/frontend/src/app/shared/components/debt-dialog/debt-dialog.component.ts b/frontend/src/app/shared/components/debt-dialog/debt-dialog.component.ts new file mode 100644 index 0000000..90f9a9b --- /dev/null +++ b/frontend/src/app/shared/components/debt-dialog/debt-dialog.component.ts @@ -0,0 +1,141 @@ +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output, signal } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { animate, style, transition, trigger } from '@angular/animations'; +import { interval, takeWhile } from 'rxjs'; + +@Component({ + selector: 'app-debt-dialog', + standalone: true, + imports: [CommonModule], + template: ` + + `, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [ + trigger('fadeInOut', [ + transition(':enter', [ + style({ opacity: 0 }), + animate('150ms ease-out', style({ opacity: 1 })), + ]), + transition(':leave', [animate('150ms ease-in', style({ opacity: 0 }))]), + ]), + trigger('cardAnimation', [ + transition(':enter', [ + style({ opacity: 0, transform: 'scale(0.95)' }), + animate('200ms ease-out', style({ opacity: 1, transform: 'scale(1)' })), + ]), + ]), + trigger('countdown', [ + transition('* => *', [ + style({ transform: 'scale(1.2)' }), + animate('100ms ease-out', style({ transform: 'scale(1)' })), + ]), + ]), + ], +}) +export class DebtDialogComponent implements OnInit, OnDestroy { + @Input() amount = 0; + @Input() set show(value: boolean) { + this.visible = value; + if (value) { + this.startTimer(); + } + } + + @Output() dialogClosed = new EventEmitter(); + + visible = false; + timeLeft = signal(30); + private timerSubscription: any; + private warningSound = new Audio('assets/sounds/warning.mp3'); + + ngOnInit() { + if (this.visible) { + this.startTimer(); + } + } + + ngOnDestroy() { + this.stopTimer(); + } + + private startTimer() { + this.timeLeft.set(30); + this.timerSubscription = interval(1000) + .pipe(takeWhile(() => this.timeLeft() > 0)) + .subscribe(() => { + this.timeLeft.update(value => value - 1); + if (this.timeLeft() <= 5) { + this.warningSound.play(); + } + if (this.timeLeft() === 0) { + setTimeout(() => this.closeDialog(), 5000); + } + }); + } + + private stopTimer() { + if (this.timerSubscription) { + this.timerSubscription.unsubscribe(); + } + } + + closeDialog(): void { + this.stopTimer(); + this.visible = false; + this.dialogClosed.emit(); + } +} \ No newline at end of file diff --git a/frontend/src/app/shared/components/navbar/navbar.component.html b/frontend/src/app/shared/components/navbar/navbar.component.html index 040e7cf..a4ea516 100644 --- a/frontend/src/app/shared/components/navbar/navbar.component.html +++ b/frontend/src/app/shared/components/navbar/navbar.component.html @@ -17,8 +17,9 @@ @if (isLoggedIn) {
- {{ balance() | currency: 'EUR' : 'symbol' : '1.2-2' }} + {{ balance() | currency: 'EUR' : 'symbol' : '1.2-2' }}
}