Compare commits

...

5 commits

Author SHA1 Message Date
c4c762cafe
Merge pull request 'feat: add user balance updates during lootbox opening' (!169) from task/CAS-44/lootbox-selection into main
All checks were successful
Release / Release (push) Successful in 1m8s
Release / Build Backend Image (push) Successful in 29s
Release / Build Frontend Image (push) Successful in 30s
Reviewed-on: #169
Reviewed-by: Jan K9f <jan@kjan.email>
2025-05-07 13:33:10 +00:00
c92a182123
style: fix formatting and add missing commas in code
All checks were successful
CI / Get Changed Files (pull_request) Successful in 18s
CI / Checkstyle Main (pull_request) Has been skipped
CI / Docker backend validation (pull_request) Successful in 15s
CI / Docker frontend validation (pull_request) Successful in 52s
CI / oxlint (pull_request) Successful in 29s
CI / eslint (pull_request) Successful in 38s
CI / prettier (pull_request) Successful in 30s
CI / test-build (pull_request) Successful in 46s
2025-05-07 15:30:40 +02:00
790485decc
feat(lootboxes): add balance check for opening lootboxes
Some checks failed
CI / Docker backend validation (pull_request) Successful in 11s
CI / Get Changed Files (pull_request) Successful in 36s
CI / Docker frontend validation (pull_request) Successful in 42s
CI / Checkstyle Main (pull_request) Has been skipped
CI / oxlint (pull_request) Successful in 30s
CI / prettier (pull_request) Failing after 30s
CI / eslint (pull_request) Successful in 38s
CI / test-build (pull_request) Successful in 33s
2025-05-07 15:30:24 +02:00
bca2649afd
Merge branch 'main' into task/CAS-44/lootbox-selection
Some checks failed
CI / Get Changed Files (pull_request) Successful in 12s
CI / Checkstyle Main (pull_request) Has been skipped
CI / Docker frontend validation (pull_request) Successful in 13s
CI / Docker backend validation (pull_request) Successful in 11s
CI / oxlint (pull_request) Successful in 28s
CI / eslint (pull_request) Successful in 30s
CI / prettier (pull_request) Failing after 29s
CI / test-build (pull_request) Successful in 33s
2025-05-07 13:23:37 +00:00
513ff7886b
feat: add user balance updates during lootbox opening
Some checks failed
CI / Get Changed Files (pull_request) Successful in 9s
CI / Checkstyle Main (pull_request) Has been skipped
CI / Docker backend validation (pull_request) Successful in 10s
CI / Docker frontend validation (pull_request) Successful in 34s
CI / oxlint (pull_request) Successful in 22s
CI / prettier (pull_request) Failing after 26s
CI / eslint (pull_request) Successful in 34s
CI / test-build (pull_request) Successful in 43s
2025-05-07 15:22:37 +02:00
7 changed files with 119 additions and 8 deletions

View file

@ -312,9 +312,11 @@ body {
opacity 0.5s ease-out,
transform 0.5s ease-out;
transition-delay: 0.5s;
pointer-events: none; /* Prevent clicks when invisible */
}
.animation-fade.visible {
opacity: 1;
transform: translateY(0);
pointer-events: auto; /* Enable clicks when visible */
}

View file

@ -31,9 +31,15 @@
<div *ngIf="!isOpening && !isOpen" class="mb-6">
<button
(click)="openLootbox()"
class="button-primary w-full py-3 text-lg font-semibold rounded"
[disabled]="!hasEnoughBalance()"
[ngClass]="{
'button-primary': hasEnoughBalance(),
'bg-gray-500 cursor-not-allowed': !hasEnoughBalance(),
}"
class="w-full py-3 text-lg font-semibold rounded"
>
Öffnen
<span *ngIf="hasEnoughBalance()">Öffnen</span>
<span *ngIf="!hasEnoughBalance()">Nicht genug Guthaben</span>
</button>
</div>
@ -85,12 +91,24 @@
class="flex justify-center gap-4 mt-8 animation-fade"
[class.visible]="animationCompleted"
>
<button (click)="openAgain()" class="button-primary px-6 py-2 font-semibold rounded">
Nochmal Öffnen
<button
(click)="openAgain()"
[disabled]="!animationCompleted || !hasEnoughBalance()"
[ngClass]="{
'button-primary': hasEnoughBalance(),
'bg-gray-500 cursor-not-allowed': !hasEnoughBalance(),
}"
class="px-6 py-2 font-semibold rounded"
[attr.aria-hidden]="!animationCompleted"
>
<span *ngIf="hasEnoughBalance()">Nochmal Öffnen</span>
<span *ngIf="!hasEnoughBalance()">Nicht genug Guthaben</span>
</button>
<button
(click)="goBack()"
class="bg-deep-blue hover:bg-deep-blue-contrast text-white px-6 py-2 rounded font-semibold transition"
[disabled]="!animationCompleted"
[attr.aria-hidden]="!animationCompleted"
>
Zurück zur Übersicht
</button>

View file

@ -4,6 +4,8 @@ import { ActivatedRoute, Router } from '@angular/router';
import { LootboxService } from '../services/lootbox.service';
import { LootBox, Reward } from 'app/model/LootBox';
import { NavbarComponent } from '@shared/components/navbar/navbar.component';
import { UserService } from '@service/user.service';
import { User } from 'app/model/User';
@Component({
selector: 'app-lootbox-opening',
@ -21,14 +23,20 @@ export default class LootboxOpeningComponent {
wonReward: Reward | null = null;
prizeList: Reward[] = [];
animationCompleted = false;
currentUser: User | null = null;
constructor(
private route: ActivatedRoute,
private router: Router,
private lootboxService: LootboxService,
private userService: UserService,
private cdr: ChangeDetectorRef
) {
this.loadLootbox();
this.userService.currentUser$.subscribe((user) => {
this.currentUser = user;
this.cdr.detectChanges();
});
}
private loadLootbox(): void {
@ -57,8 +65,24 @@ export default class LootboxOpeningComponent {
openLootbox(): void {
if (!this.lootbox || this.isOpening) return;
// Check if user has enough balance
if (!this.hasEnoughBalance()) {
this.error = 'Nicht genug Guthaben, um diese Lootbox zu öffnen.';
window.scrollTo(0, 0);
this.cdr.detectChanges();
setTimeout(() => {
this.error = '';
this.cdr.detectChanges();
}, 5000);
return;
}
this.resetState(true);
if (this.lootbox.price) {
this.userService.updateLocalBalance(-this.lootbox.price);
}
setTimeout(() => {
this.lootboxService.purchaseLootBox(this.lootbox!.id).subscribe({
next: this.handleRewardSuccess.bind(this),
@ -72,6 +96,7 @@ export default class LootboxOpeningComponent {
this.generateCasePrizes(reward);
this.isOpening = false;
this.isOpen = true;
this.cdr.detectChanges();
}
@ -80,7 +105,12 @@ export default class LootboxOpeningComponent {
const rewards = this.lootbox.rewards;
const fallback = rewards[Math.floor(Math.random() * rewards.length)];
this.handleRewardSuccess(fallback);
this.wonReward = fallback;
this.generateCasePrizes(fallback);
this.isOpening = false;
this.isOpen = true;
this.cdr.detectChanges();
}
private resetState(isOpening = false): void {
@ -112,6 +142,12 @@ export default class LootboxOpeningComponent {
setTimeout(() => {
this.animationCompleted = true;
if (this.wonReward) {
this.userService.updateLocalBalance(this.wonReward.value);
}
this.userService.refreshCurrentUser();
this.cdr.detectChanges();
}, 10000);
}
@ -168,4 +204,9 @@ export default class LootboxOpeningComponent {
if (!this.wonReward || !this.lootbox) return '';
return this.wonReward.value > (this.lootbox.price || 0) ? 'text-emerald' : 'text-accent-red';
}
hasEnoughBalance(): boolean {
if (!this.currentUser || !this.lootbox) return false;
return this.currentUser.balance >= this.lootbox.price;
}
}

View file

@ -44,9 +44,15 @@
<div class="mt-4">
<button
(click)="openLootbox(lootbox.id)"
class="button-primary w-full py-2 rounded font-semibold"
[disabled]="!hasEnoughBalance(lootbox.price)"
[ngClass]="{
'button-primary': hasEnoughBalance(lootbox.price),
'bg-gray-500 cursor-not-allowed': !hasEnoughBalance(lootbox.price),
}"
class="w-full py-2 rounded font-semibold"
>
Öffnen
<span *ngIf="hasEnoughBalance(lootbox.price)">Öffnen</span>
<span *ngIf="!hasEnoughBalance(lootbox.price)">Nicht genug Guthaben</span>
</button>
</div>
</div>

View file

@ -5,6 +5,8 @@ import { LootboxService } from '../services/lootbox.service';
import { LootBox } from 'app/model/LootBox';
import { Router } from '@angular/router';
import { timeout } from 'rxjs';
import { UserService } from '@service/user.service';
import { User } from 'app/model/User';
@Component({
selector: 'app-lootbox-selection',
@ -17,6 +19,7 @@ export default class LootboxSelectionComponent implements OnInit {
lootboxes: LootBox[] = [];
isLoading = true;
error = '';
currentUser: User | null = null;
// Fallback data in case the API call fails
fallbackLootboxes: LootBox[] = [
@ -86,11 +89,16 @@ export default class LootboxSelectionComponent implements OnInit {
constructor(
private lootboxService: LootboxService,
private router: Router,
private cdr: ChangeDetectorRef
private cdr: ChangeDetectorRef,
private userService: UserService
) {}
ngOnInit(): void {
this.loadLootboxes();
this.userService.currentUser$.subscribe((user) => {
this.currentUser = user;
this.cdr.detectChanges();
});
}
loadLootboxes(): void {
@ -120,6 +128,24 @@ export default class LootboxSelectionComponent implements OnInit {
}
openLootbox(lootboxId: number): void {
const lootbox = this.lootboxes.find((box) => box.id === lootboxId);
if (!lootbox) {
return;
}
if (!this.currentUser || this.currentUser.balance < lootbox.price) {
this.error = 'Nicht genug Guthaben, um diese Lootbox zu öffnen.';
// Scroll to top to see the error message
window.scrollTo(0, 0);
this.cdr.detectChanges();
setTimeout(() => {
this.error = '';
this.cdr.detectChanges();
}, 5000);
return;
}
this.router.navigate(['/game/lootboxes/open', lootboxId]);
}
@ -136,4 +162,8 @@ export default class LootboxSelectionComponent implements OnInit {
formatProbability(probability: number): string {
return (probability * 100).toFixed(0) + '%';
}
hasEnoughBalance(price: number): boolean {
return !!this.currentUser && this.currentUser.balance >= price;
}
}

View file

@ -33,6 +33,17 @@ export class UserService {
this.getCurrentUser().subscribe();
}
public updateLocalBalance(amount: number): void {
const currentUser = this.currentUserSubject.getValue();
if (currentUser) {
const updatedUser = {
...currentUser,
balance: currentUser.balance + amount,
};
this.currentUserSubject.next(updatedUser);
}
}
public createUser(id: string, username: string): Observable<User> {
return this.http
.post<User>('/backend/user', {

View file

@ -31,7 +31,10 @@ export class NavbarComponent implements OnInit, OnDestroy {
ngOnInit() {
this.userSubscription = this.userService.currentUser$.subscribe((user) => {
this.balance.set(user?.balance ?? 0);
console.log('Updated navbar balance:', user?.balance);
});
this.userService.refreshCurrentUser();
}
ngOnDestroy() {