From b2f80dedf26f01fc7db4666b8793ba32eced8d94 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:05:21 +0200 Subject: [PATCH 1/6] feat: adjust game grid --- .../src/app/feature/home/home.component.html | 50 +------------------ 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/frontend/src/app/feature/home/home.component.html b/frontend/src/app/feature/home/home.component.html index b0b77d3..54f9e7a 100644 --- a/frontend/src/app/feature/home/home.component.html +++ b/frontend/src/app/feature/home/home.component.html @@ -4,7 +4,7 @@
-
+

Alle Spiele

@@ -43,53 +43,5 @@
- -
-
-

Konto

-
- - - - -
-
- - - -
-

Letzte Transaktionen

-
-
-
-

{{ transaction.status }}

-

- {{ transaction.createdAt | date: 'd.m.y H:m' }} -

-
- - {{ transaction.amount | currency: 'EUR' }} - -
-
-
-
From 06f2ae5d86c2f62b7e8c54de54fee7521f9adfbc Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:17:36 +0200 Subject: [PATCH 2/6] feat: improve game grid --- .../src/app/feature/home/home.component.html | 60 ++++++++++++++----- frontend/src/styles.css | 6 +- 2 files changed, 49 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/feature/home/home.component.html b/frontend/src/app/feature/home/home.component.html index 54f9e7a..c195acf 100644 --- a/frontend/src/app/feature/home/home.component.html +++ b/frontend/src/app/feature/home/home.component.html @@ -18,24 +18,52 @@
-
-
-
- -
+
+ +
+
+
+
-

{{ game.name }}

- +
+

{{ game.name }}

+ +
+
+
+
+
+ + +
+
+
+ +
+
+

{{ game.name }}

+ +
diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 57a0f6a..43d7156 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -52,7 +52,7 @@ a { } .slider-grid { - @apply min-w-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4; + @apply min-w-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4; } .welcome-bonus { @@ -71,6 +71,10 @@ a { @apply font-bold text-text-primary text-sm mb-2; } +.game-heading { + @apply font-bold text-text-primary text-lg mb-2; +} + .game-heading-xl { @apply font-bold text-text-primary text-xl mb-2; } From d4fd5e068dfde7e99d97ce971682c886311c68c9 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:49:03 +0200 Subject: [PATCH 3/6] feat: restyle navbar --- .../src/app/feature/home/home.component.ts | 48 +----- .../components/navbar/navbar.component.html | 162 +++++++++++++++--- .../components/navbar/navbar.component.ts | 26 ++- 3 files changed, 169 insertions(+), 67 deletions(-) diff --git a/frontend/src/app/feature/home/home.component.ts b/frontend/src/app/feature/home/home.component.ts index ef947f9..f6c4ab2 100644 --- a/frontend/src/app/feature/home/home.component.ts +++ b/frontend/src/app/feature/home/home.component.ts @@ -1,34 +1,21 @@ -import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; -import { AsyncPipe, CurrencyPipe, DatePipe, NgFor } from '@angular/common'; -import { DepositComponent } from '../deposit/deposit.component'; -import { ActivatedRoute, Router } from '@angular/router'; -import { ConfirmationComponent } from '@shared/components/confirmation/confirmation.component'; -import { Game } from 'app/model/Game'; -import { Observable } from 'rxjs'; -import { TransactionService } from '@service/transaction.service'; +import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; +import {NgFor} from '@angular/common'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Game} from 'app/model/Game'; import format from 'ajv/dist/vocabularies/format'; -import { TransactionHistoryComponent } from '../transaction-history/transaction-history.component'; -import { TransactionData } from '../../model/TransactionData'; @Component({ selector: 'app-homepage', standalone: true, imports: [ - CurrencyPipe, NgFor, - DepositComponent, - ConfirmationComponent, - AsyncPipe, - DatePipe, - TransactionHistoryComponent, + ], templateUrl: './home.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) export default class HomeComponent implements OnInit { - isDepositModalOpen = false; isDepositSuccessful = false; - isTransactionModalOpen = false; constructor( public route: ActivatedRoute, @@ -78,35 +65,10 @@ export default class HomeComponent implements OnInit { }, ]; - allGames: Game[] = [...this.featuredGames]; - - recentTransactionData: Observable = - inject(TransactionService).getUsersTransactions(5); - - openDepositModal() { - this.isDepositModalOpen = true; - } - - closeDepositModal() { - this.isDepositModalOpen = false; - } - openDepositConfirmationModal() { this.isDepositSuccessful = true; } - openTransactionModal() { - this.isTransactionModalOpen = true; - } - - closeDepositConfirmationModal() { - this.isDepositSuccessful = false; - } - - closeTransactionModal() { - this.isTransactionModalOpen = false; - } - navigateToGame(route: string) { this.router.navigate([route]); } diff --git a/frontend/src/app/shared/components/navbar/navbar.component.html b/frontend/src/app/shared/components/navbar/navbar.component.html index 7e010fa..b499668 100644 --- a/frontend/src/app/shared/components/navbar/navbar.component.html +++ b/frontend/src/app/shared/components/navbar/navbar.component.html @@ -1,40 +1,106 @@ -