diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 3adc99f..2e3cd9a 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -1,32 +1,7 @@
- +
- - Auth Forms Overlay --> - @if (showLogin() || showRegister()) { - - - }
diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 52c1fc3..3e25d5b 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,44 +1,16 @@ -import { Component, HostListener, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { RouterOutlet } from '@angular/router'; -import { NavbarComponent } from './shared/components/navbar/navbar.component'; -import { FooterComponent } from './shared/components/footer/footer.component'; -import { LoginComponent } from './feature/auth/login/login.component'; -import { RegisterComponent } from './feature/auth/register/register.component'; +import { FooterComponent } from '@shared/components/footer/footer.component'; +import { NavbarComponent } from '@shared/components/navbar/navbar.component'; @Component({ selector: 'app-root', standalone: true, - imports: [RouterOutlet, NavbarComponent, FooterComponent, LoginComponent, RegisterComponent], + imports: [CommonModule, RouterOutlet, FooterComponent, NavbarComponent], + providers: [], templateUrl: './app.component.html', + styleUrl: './app.component.css', + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AppComponent { - showLogin = signal(false); - showRegister = signal(false); - - @HostListener('document:keydown.escape') - handleEscapeKey() { - this.hideAuthForms(); - } - - showLoginForm() { - this.showLogin.set(true); - this.showRegister.set(false); - document.body.style.overflow = 'hidden'; - } - - showRegisterForm() { - this.showRegister.set(true); - this.showLogin.set(false); - document.body.style.overflow = 'hidden'; - } - - hideAuthForms() { - this.showLogin.set(false); - this.showRegister.set(false); - document.body.style.overflow = 'auto'; - } - - stopPropagation(event: MouseEvent) { - event.stopPropagation(); - } -} +export class AppComponent {} diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 3792038..86ce3d4 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -7,6 +7,16 @@ export const routes: Routes = [ path: '', component: LandingComponent, }, + { + path: 'login', + loadComponent: () => + import('./feature/auth/login/login.component').then((m) => m.LoginComponent), + }, + { + path: 'register', + loadComponent: () => + import('./feature/auth/register/register.component').then((m) => m.RegisterComponent), + }, { path: 'home', loadComponent: () => import('./feature/home/home.component'), diff --git a/frontend/src/app/feature/auth/login/login.component.html b/frontend/src/app/feature/auth/login/login.component.html index 5f4c535..40fc3e6 100644 --- a/frontend/src/app/feature/auth/login/login.component.html +++ b/frontend/src/app/feature/auth/login/login.component.html @@ -1,26 +1,5 @@
-
- - +

Anmelden

@if (errorMessage()) { @@ -86,12 +65,12 @@

Noch kein Konto? - +

diff --git a/frontend/src/app/feature/auth/login/login.component.ts b/frontend/src/app/feature/auth/login/login.component.ts index b5a67a0..8874dbc 100644 --- a/frontend/src/app/feature/auth/login/login.component.ts +++ b/frontend/src/app/feature/auth/login/login.component.ts @@ -1,6 +1,6 @@ -import { Component, EventEmitter, Output, signal } from '@angular/core'; +import { Component, signal } from '@angular/core'; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Router, RouterLink } from '@angular/router'; import { LoginRequest } from '../../../model/auth/LoginRequest'; import { AuthService } from '@service/auth.service'; import { CommonModule } from '@angular/common'; @@ -8,15 +8,13 @@ import { CommonModule } from '@angular/common'; @Component({ selector: 'app-login', standalone: true, - imports: [CommonModule, ReactiveFormsModule], + imports: [CommonModule, ReactiveFormsModule, RouterLink], templateUrl: './login.component.html', }) export class LoginComponent { loginForm: FormGroup; errorMessage = signal(''); isLoading = signal(false); - @Output() switchForm = new EventEmitter(); - @Output() closeDialog = new EventEmitter(); constructor( private fb: FormBuilder, @@ -33,10 +31,6 @@ export class LoginComponent { return this.loginForm.controls; } - switchToRegister(): void { - this.switchForm.emit(); - } - onSubmit(): void { if (this.loginForm.invalid) { return; @@ -52,7 +46,6 @@ export class LoginComponent { this.authService.login(loginRequest).subscribe({ next: () => { - this.closeDialog.emit(); this.router.navigate(['/home']); }, error: (err) => { diff --git a/frontend/src/app/feature/auth/register/register.component.html b/frontend/src/app/feature/auth/register/register.component.html index cf342b0..5339e36 100644 --- a/frontend/src/app/feature/auth/register/register.component.html +++ b/frontend/src/app/feature/auth/register/register.component.html @@ -1,26 +1,5 @@
-
- - +

Konto erstellen

@if (errorMessage()) { @@ -128,12 +107,12 @@

Bereits ein Konto? - +

diff --git a/frontend/src/app/feature/auth/register/register.component.ts b/frontend/src/app/feature/auth/register/register.component.ts index 7a3e381..1ccc15c 100644 --- a/frontend/src/app/feature/auth/register/register.component.ts +++ b/frontend/src/app/feature/auth/register/register.component.ts @@ -1,6 +1,6 @@ -import { Component, EventEmitter, Output, signal } from '@angular/core'; +import { Component, signal } from '@angular/core'; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Router, RouterLink } from '@angular/router'; import { RegisterRequest } from '../../../model/auth/RegisterRequest'; import { AuthService } from '@service/auth.service'; import { CommonModule } from '@angular/common'; @@ -9,7 +9,7 @@ import { HttpErrorResponse } from '@angular/common/http'; @Component({ selector: 'app-register', standalone: true, - imports: [CommonModule, ReactiveFormsModule], + imports: [CommonModule, ReactiveFormsModule, RouterLink], templateUrl: './register.component.html', }) export class RegisterComponent { @@ -17,8 +17,6 @@ export class RegisterComponent { errorMessage = signal(''); isLoading = signal(false); fieldErrors = signal>({}); - @Output() switchForm = new EventEmitter(); - @Output() closeDialog = new EventEmitter(); constructor( private fb: FormBuilder, @@ -36,10 +34,6 @@ export class RegisterComponent { return this.registerForm.controls; } - switchToLogin(): void { - this.switchForm.emit(); - } - onSubmit(): void { if (this.registerForm.invalid) { return; diff --git a/frontend/src/app/feature/game/slots/slots.component.html b/frontend/src/app/feature/game/slots/slots.component.html index b7ddcf6..380c898 100644 --- a/frontend/src/app/feature/game/slots/slots.component.html +++ b/frontend/src/app/feature/game/slots/slots.component.html @@ -2,10 +2,13 @@

Spielautomaten

+
+
+

Slot Machine

+
@@ -55,6 +60,9 @@
+ + +
@@ -90,6 +98,7 @@
+

Spiel Informationen

diff --git a/frontend/src/app/feature/landing/landing.component.html b/frontend/src/app/feature/landing/landing.component.html index 9a6203d..aa411fd 100644 --- a/frontend/src/app/feature/landing/landing.component.html +++ b/frontend/src/app/feature/landing/landing.component.html @@ -1,4 +1,4 @@ -
+
@@ -17,18 +17,18 @@ Spiele } @else { - - + }
@@ -120,8 +120,8 @@ xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" - stroke="currentColor" viewBox="0 0 24 24" + stroke="currentColor" >
- - @if (showLogin() || showRegister()) { - - - }
diff --git a/frontend/src/app/feature/landing/landing.component.ts b/frontend/src/app/feature/landing/landing.component.ts index d4d6078..9e66baf 100644 --- a/frontend/src/app/feature/landing/landing.component.ts +++ b/frontend/src/app/feature/landing/landing.component.ts @@ -1,21 +1,12 @@ -import { - ChangeDetectionStrategy, - Component, - inject, - OnDestroy, - OnInit, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnDestroy, OnInit } from '@angular/core'; import { NgFor } from '@angular/common'; import { RouterLink } from '@angular/router'; import { AuthService } from '@service/auth.service'; -import { LoginComponent } from '../auth/login/login.component'; -import { RegisterComponent } from '../auth/register/register.component'; @Component({ selector: 'app-landing-page', standalone: true, - imports: [NgFor, RouterLink, LoginComponent, RegisterComponent], + imports: [NgFor, RouterLink], templateUrl: './landing.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) @@ -23,35 +14,13 @@ export class LandingComponent implements OnInit, OnDestroy { currentSlide = 0; private autoplayInterval: ReturnType | undefined; authService: AuthService = inject(AuthService); - showLogin = signal(false); - showRegister = signal(false); ngOnInit() { this.startAutoplay(); - document.body.style.overflow = 'auto'; } ngOnDestroy() { this.stopAutoplay(); - document.body.style.overflow = 'auto'; - } - - showLoginForm() { - this.showLogin.set(true); - this.showRegister.set(false); - document.body.style.overflow = 'hidden'; - } - - showRegisterForm() { - this.showRegister.set(true); - this.showLogin.set(false); - document.body.style.overflow = 'hidden'; - } - - hideAuthForms() { - this.showLogin.set(false); - this.showRegister.set(false); - document.body.style.overflow = 'auto'; } prevSlide() { diff --git a/frontend/src/app/shared/components/navbar/navbar.component.html b/frontend/src/app/shared/components/navbar/navbar.component.html index 7e010fa..749437f 100644 --- a/frontend/src/app/shared/components/navbar/navbar.component.html +++ b/frontend/src/app/shared/components/navbar/navbar.component.html @@ -12,13 +12,12 @@