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 158e32c..ebddd1a 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -74,6 +74,10 @@ 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 fda8f1b..887aeeb 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -48,14 +48,6 @@ - - - diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.ts b/frontend/src/app/feature/game/blackjack/blackjack.component.ts index 702776e..78f3533 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.ts +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.ts @@ -14,7 +14,6 @@ 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', @@ -28,7 +27,6 @@ import { DebtDialogComponent } from '@shared/components/debt-dialog/debt-dialog. GameControlsComponent, GameInfoComponent, GameResultComponent, - DebtDialogComponent, ], templateUrl: './blackjack.component.html', changeDetection: ChangeDetectionStrategy.OnPush, @@ -50,9 +48,6 @@ 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) { @@ -172,12 +167,7 @@ export default class BlackjackComponent implements OnInit { this.blackjackService.doubleDown(this.currentGameId()!).subscribe({ next: (game) => { this.updateGameState(game); - this.userService.getCurrentUser().subscribe((user) => { - if (user && user.balance < 0) { - this.debtAmount.set(Math.abs(user.balance)); - this.showDebtDialog.set(true); - } - }); + this.userService.refreshCurrentUser(); this.isActionInProgress.set(false); }, error: (error) => { @@ -194,10 +184,6 @@ 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 b1a40ed..45174ca 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: `
-

Dealer's Karten

+

Croupier'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 59a6d9f..b76baa5 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,28 +13,39 @@ import { GameState } from '../../enum/gameState';

{{ getResultMessage() }}

-
+
Einsatz:
-
{{ amount | currency:'EUR' }}
+
{{ amount }} €
{{ isDraw ? 'Zurückgegeben:' : isWin ? 'Gewonnen:' : 'Verloren:' }}
-
- {{ isLoss ? '-' : '+' }}{{ isWin ? (amount * 2) : amount | currency:'EUR' }} -
- (Einsatz {{ amount | currency:'EUR' }} × 2) -
+
+ {{ isLoss ? '-' : '+' }}{{ amount }} €
-
Kontostand:
-
- {{ balance | currency:'EUR' }} +
+ Gesamt: +
+
+ {{ isWin ? '+' : isLoss ? '-' : '' }}{{ amount }} €
@@ -65,7 +76,6 @@ 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 deleted file mode 100644 index 90f9a9b..0000000 --- a/frontend/src/app/shared/components/debt-dialog/debt-dialog.component.ts +++ /dev/null @@ -1,141 +0,0 @@ -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 a4ea516..040e7cf 100644 --- a/frontend/src/app/shared/components/navbar/navbar.component.html +++ b/frontend/src/app/shared/components/navbar/navbar.component.html @@ -17,9 +17,8 @@ @if (isLoggedIn) {
- {{ balance() | currency: 'EUR' : 'symbol' : '1.2-2' }} + {{ balance() | currency: 'EUR' : 'symbol' : '1.2-2' }}
}