From bd031e86583cc658da6353ab831b4516e73c13ac Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 10:29:30 +0200 Subject: [PATCH 01/11] fix: adjust inconsistencies in the frontend --- .../feature/landing/landing.component.html | 16 ++++++------- .../components/footer/footer.component.html | 23 ++++--------------- .../components/footer/footer.component.ts | 4 ++-- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/frontend/src/app/feature/landing/landing.component.html b/frontend/src/app/feature/landing/landing.component.html index ae963a9..2f38d9f 100644 --- a/frontend/src/app/feature/landing/landing.component.html +++ b/frontend/src/app/feature/landing/landing.component.html @@ -64,20 +64,20 @@ > - - -
-
+ +
+ +

Dice

@@ -165,7 +165,7 @@
24/7
-
Support *
+
Support
diff --git a/frontend/src/app/shared/components/footer/footer.component.html b/frontend/src/app/shared/components/footer/footer.component.html index 79cf823..ef2de86 100644 --- a/frontend/src/app/shared/components/footer/footer.component.html +++ b/frontend/src/app/shared/components/footer/footer.component.html @@ -5,24 +5,19 @@

Casino Spiele

-
-
-

Andere Spiele

-
@@ -54,10 +49,6 @@ Google Pay
-
- - Apple Pay -
@@ -65,10 +56,6 @@
- - * nicht vorhanden. - -
© {{ currentYear }} Trustworthy Casino. Keine Rechte vorbehalten.
diff --git a/frontend/src/app/shared/components/footer/footer.component.ts b/frontend/src/app/shared/components/footer/footer.component.ts index 2cb56e1..15d4e0e 100644 --- a/frontend/src/app/shared/components/footer/footer.component.ts +++ b/frontend/src/app/shared/components/footer/footer.component.ts @@ -2,12 +2,13 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faCreditCard, faMoneyBillTransfer, faWallet } from '@fortawesome/free-solid-svg-icons'; import { faApplePay, faGooglePay, faPaypal } from '@fortawesome/free-brands-svg-icons'; +import {RouterLink} from "@angular/router"; @Component({ selector: 'app-footer', standalone: true, templateUrl: './footer.component.html', - imports: [FontAwesomeModule], + imports: [FontAwesomeModule, RouterLink], changeDetection: ChangeDetectionStrategy.OnPush, }) export class FooterComponent { @@ -18,5 +19,4 @@ export class FooterComponent { faMoneyBillTransfer = faMoneyBillTransfer; faWallet = faWallet; faGooglePay = faGooglePay; - faApplePay = faApplePay; } From a4e12272e58e1a7904a6e2dc14f8531fb9042176 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 10:30:38 +0200 Subject: [PATCH 02/11] fix: remove apple icon import --- frontend/src/app/shared/components/footer/footer.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/shared/components/footer/footer.component.ts b/frontend/src/app/shared/components/footer/footer.component.ts index 15d4e0e..e04a1f9 100644 --- a/frontend/src/app/shared/components/footer/footer.component.ts +++ b/frontend/src/app/shared/components/footer/footer.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faCreditCard, faMoneyBillTransfer, faWallet } from '@fortawesome/free-solid-svg-icons'; -import { faApplePay, faGooglePay, faPaypal } from '@fortawesome/free-brands-svg-icons'; +import { faGooglePay, faPaypal } from '@fortawesome/free-brands-svg-icons'; import {RouterLink} from "@angular/router"; @Component({ From d388f2a7860c801781a5569b26d30413ebf878f0 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 10:51:56 +0200 Subject: [PATCH 03/11] style: die of cancer prettier --- frontend/src/app/shared/components/footer/footer.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/shared/components/footer/footer.component.ts b/frontend/src/app/shared/components/footer/footer.component.ts index e04a1f9..b47b6fd 100644 --- a/frontend/src/app/shared/components/footer/footer.component.ts +++ b/frontend/src/app/shared/components/footer/footer.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faCreditCard, faMoneyBillTransfer, faWallet } from '@fortawesome/free-solid-svg-icons'; import { faGooglePay, faPaypal } from '@fortawesome/free-brands-svg-icons'; -import {RouterLink} from "@angular/router"; +import { RouterLink } from '@angular/router'; @Component({ selector: 'app-footer', From ada291b64081414314a3090952765f5f95f84192 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:05:21 +0200 Subject: [PATCH 04/11] 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 e5e47ff96e60eb2c85b5ff7847be6d731bac15fc Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:17:36 +0200 Subject: [PATCH 05/11] 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 64923719e4e25cd48f4fc3bf248006922efd99f4 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 4 Jun 2025 11:49:03 +0200 Subject: [PATCH 06/11] 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 @@ -